64bitビルドに対応
該当箇所のintをintptr_tに変更
This commit is contained in:
epgdatacapbon
parent
3141284e19
commit
7f75f30f35
@ -8,13 +8,19 @@ EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Win32 = Debug|Win32
|
||||
Debug|x64 = Debug|x64
|
||||
Release|Win32 = Release|Win32
|
||||
Release|x64 = Release|x64
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{6E77C1AC-A31A-49B9-9A52-9FE1E03B8FEC}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{6E77C1AC-A31A-49B9-9A52-9FE1E03B8FEC}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{6E77C1AC-A31A-49B9-9A52-9FE1E03B8FEC}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{6E77C1AC-A31A-49B9-9A52-9FE1E03B8FEC}.Debug|x64.Build.0 = Debug|x64
|
||||
{6E77C1AC-A31A-49B9-9A52-9FE1E03B8FEC}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{6E77C1AC-A31A-49B9-9A52-9FE1E03B8FEC}.Release|Win32.Build.0 = Release|Win32
|
||||
{6E77C1AC-A31A-49B9-9A52-9FE1E03B8FEC}.Release|x64.ActiveCfg = Release|x64
|
||||
{6E77C1AC-A31A-49B9-9A52-9FE1E03B8FEC}.Release|x64.Build.0 = Release|x64
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
||||
@ -5,10 +5,18 @@
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Debug|x64">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|Win32">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|x64">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
</ItemGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{6E77C1AC-A31A-49B9-9A52-9FE1E03B8FEC}</ProjectGuid>
|
||||
@ -22,20 +30,37 @@
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<PlatformToolset>v120</PlatformToolset>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<PlatformToolset>v120</PlatformToolset>
|
||||
<CharacterSet>MultiByte</CharacterSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<PlatformToolset>v120</PlatformToolset>
|
||||
<CharacterSet>MultiByte</CharacterSet>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="ExtensionSettings">
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<PropertyGroup>
|
||||
<_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
|
||||
@ -44,11 +69,21 @@
|
||||
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
|
||||
<IntDir>$(Configuration)\</IntDir>
|
||||
<LinkIncremental>true</LinkIncremental>
|
||||
<TargetName>b25</TargetName>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<LinkIncremental>true</LinkIncremental>
|
||||
<TargetName>b25</TargetName>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
|
||||
<IntDir>$(Configuration)\</IntDir>
|
||||
<LinkIncremental>false</LinkIncremental>
|
||||
<TargetName>b25</TargetName>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<LinkIncremental>false</LinkIncremental>
|
||||
<TargetName>b25</TargetName>
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<ClCompile>
|
||||
@ -67,6 +102,25 @@
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<TargetMachine>MachineX86</TargetMachine>
|
||||
<ImageHasSafeExceptionHandlers />
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<AdditionalDependencies>winscard.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<OutputFile>$(OutDir)b25.exe</OutputFile>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<SubSystem>Console</SubSystem>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
@ -80,13 +134,31 @@
|
||||
<Link>
|
||||
<AdditionalDependencies>winscard.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<OutputFile>$(OutDir)b25.exe</OutputFile>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<TargetMachine>MachineX86</TargetMachine>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<ClCompile>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<AdditionalDependencies>winscard.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<OutputFile>$(OutDir)b25.exe</OutputFile>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="src\arib_std_b25.c" />
|
||||
<ClCompile Include="src\b_cas_card.c" />
|
||||
|
||||
@ -91,7 +91,7 @@ typedef struct {
|
||||
|
||||
int32_t unit_size;
|
||||
|
||||
int32_t sbuf_offset;
|
||||
intptr_t sbuf_offset;
|
||||
|
||||
TS_SECTION_PARSER *pat;
|
||||
TS_SECTION_PARSER *cat;
|
||||
@ -398,7 +398,7 @@ static TS_STREAM_ELEM *create_stream_elem(int32_t pid, int32_t type);
|
||||
static void put_stream_list_tail(TS_STREAM_LIST *list, TS_STREAM_ELEM *elem);
|
||||
static void clear_stream_list(TS_STREAM_LIST *list);
|
||||
|
||||
static int reserve_work_buffer(TS_WORK_BUFFER *buf, int32_t size);
|
||||
static int reserve_work_buffer(TS_WORK_BUFFER *buf, intptr_t size);
|
||||
static int append_work_buffer(TS_WORK_BUFFER *buf, uint8_t *data, int32_t size);
|
||||
static void reset_work_buffer(TS_WORK_BUFFER *buf);
|
||||
static void release_work_buffer(TS_WORK_BUFFER *buf);
|
||||
@ -513,7 +513,7 @@ static int reset_arib_std_b25(void *std_b25)
|
||||
static int flush_arib_std_b25(void *std_b25)
|
||||
{
|
||||
int r,l;
|
||||
int m,n;
|
||||
intptr_t m,n;
|
||||
|
||||
int32_t crypt;
|
||||
int32_t unit;
|
||||
@ -1039,7 +1039,8 @@ static void teardown(ARIB_STD_B25_PRIVATE_DATA *prv)
|
||||
static int select_unit_size(ARIB_STD_B25_PRIVATE_DATA *prv)
|
||||
{
|
||||
int i;
|
||||
int m,n,w;
|
||||
intptr_t m,w;
|
||||
int n;
|
||||
int count[320-188];
|
||||
|
||||
unsigned char *head;
|
||||
@ -1102,7 +1103,8 @@ static int select_unit_size(ARIB_STD_B25_PRIVATE_DATA *prv)
|
||||
static int find_pat(ARIB_STD_B25_PRIVATE_DATA *prv)
|
||||
{
|
||||
int r;
|
||||
int n,size;
|
||||
int n;
|
||||
intptr_t size;
|
||||
|
||||
int32_t unit;
|
||||
|
||||
@ -1183,8 +1185,8 @@ static int proc_pat(ARIB_STD_B25_PRIVATE_DATA *prv)
|
||||
{
|
||||
int r;
|
||||
int i,n;
|
||||
int len;
|
||||
int count;
|
||||
intptr_t len;
|
||||
intptr_t count;
|
||||
|
||||
int32_t program_number;
|
||||
int32_t pid;
|
||||
@ -1299,7 +1301,8 @@ static int check_pmt_complete(ARIB_STD_B25_PRIVATE_DATA *prv)
|
||||
static int find_pmt(ARIB_STD_B25_PRIVATE_DATA *prv)
|
||||
{
|
||||
int r;
|
||||
int n,size;
|
||||
int n;
|
||||
intptr_t size;
|
||||
|
||||
int32_t unit;
|
||||
|
||||
@ -1671,7 +1674,8 @@ static int check_ecm_complete(ARIB_STD_B25_PRIVATE_DATA *prv)
|
||||
static int find_ecm(ARIB_STD_B25_PRIVATE_DATA *prv)
|
||||
{
|
||||
int r;
|
||||
int n,size;
|
||||
int n;
|
||||
intptr_t size;
|
||||
|
||||
int32_t unit;
|
||||
|
||||
@ -1815,7 +1819,7 @@ LAST:
|
||||
static int proc_ecm(DECRYPTOR_ELEM *dec, B_CAS_CARD *bcas, int32_t multi2_round)
|
||||
{
|
||||
int r,n;
|
||||
int length;
|
||||
uint32_t length;
|
||||
|
||||
uint8_t *p;
|
||||
|
||||
@ -1963,7 +1967,7 @@ static void dump_pts(uint8_t *src, int32_t crypt)
|
||||
static int proc_arib_std_b25(ARIB_STD_B25_PRIVATE_DATA *prv)
|
||||
{
|
||||
int r;
|
||||
int m,n;
|
||||
intptr_t m,n;
|
||||
|
||||
int32_t crypt;
|
||||
int32_t unit;
|
||||
@ -2650,9 +2654,10 @@ static void clear_stream_list(TS_STREAM_LIST *list)
|
||||
list->count = 0;
|
||||
}
|
||||
|
||||
static int reserve_work_buffer(TS_WORK_BUFFER *buf, int32_t size)
|
||||
static int reserve_work_buffer(TS_WORK_BUFFER *buf, intptr_t size)
|
||||
{
|
||||
int m,n;
|
||||
intptr_t m;
|
||||
int n;
|
||||
uint8_t *p;
|
||||
|
||||
if(buf->max >= size){
|
||||
@ -2694,7 +2699,7 @@ static int reserve_work_buffer(TS_WORK_BUFFER *buf, int32_t size)
|
||||
|
||||
static int append_work_buffer(TS_WORK_BUFFER *buf, uint8_t *data, int32_t size)
|
||||
{
|
||||
int m;
|
||||
intptr_t m;
|
||||
|
||||
if(size < 1){
|
||||
/* ignore - do nothing */
|
||||
@ -2786,7 +2791,8 @@ static uint8_t *resync(uint8_t *head, uint8_t *tail, int32_t unit_size)
|
||||
|
||||
static uint8_t *resync_force(uint8_t *head, uint8_t *tail, int32_t unit_size)
|
||||
{
|
||||
int i,n;
|
||||
int i;
|
||||
intptr_t n;
|
||||
unsigned char *buf;
|
||||
|
||||
buf = head;
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
typedef struct {
|
||||
uint8_t *data;
|
||||
int32_t size;
|
||||
uint32_t size;
|
||||
} ARIB_STD_B25_BUFFER;
|
||||
|
||||
typedef struct {
|
||||
|
||||
@ -503,8 +503,8 @@ static void teardown(B_CAS_CARD_PRIVATE_DATA *prv)
|
||||
|
||||
static int change_id_max(B_CAS_CARD_PRIVATE_DATA *prv, int max)
|
||||
{
|
||||
int m;
|
||||
int reader_size;
|
||||
intptr_t m;
|
||||
intptr_t reader_size;
|
||||
int pwctrl_size;
|
||||
|
||||
uint8_t *p;
|
||||
@ -544,8 +544,8 @@ static int change_id_max(B_CAS_CARD_PRIVATE_DATA *prv, int max)
|
||||
|
||||
static int change_pwc_max(B_CAS_CARD_PRIVATE_DATA *prv, int max)
|
||||
{
|
||||
int m;
|
||||
int reader_size;
|
||||
intptr_t m;
|
||||
intptr_t reader_size;
|
||||
int cardid_size;
|
||||
|
||||
uint8_t *p;
|
||||
|
||||
@ -72,7 +72,7 @@ static int set_init_cbc_multi2(void *m2, uint8_t *val);
|
||||
static int set_scramble_key_multi2(void *m2, uint8_t *val);
|
||||
static int clear_scramble_key_multi2(void *m2);
|
||||
static int encrypt_multi2(void *m2, int32_t type, uint8_t *buf, int32_t size);
|
||||
static int decrypt_multi2(void *m2, int32_t type, uint8_t *buf, int32_t size);
|
||||
static int decrypt_multi2(void *m2, int32_t type, uint8_t *buf, intptr_t size);
|
||||
|
||||
/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
global function implementation
|
||||
@ -325,7 +325,7 @@ static int encrypt_multi2(void *m2, int32_t type, uint8_t *buf, int32_t size)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int decrypt_multi2(void *m2, int32_t type, uint8_t *buf, int32_t size)
|
||||
static int decrypt_multi2(void *m2, int32_t type, uint8_t *buf, intptr_t size)
|
||||
{
|
||||
CORE_DATA src,dst,cbc;
|
||||
CORE_PARAM *prm;
|
||||
|
||||
@ -18,7 +18,7 @@ typedef struct {
|
||||
int (* clear_scramble_key)(void *m2);
|
||||
|
||||
int (* encrypt)(void *m2, int32_t type, uint8_t *buf, int32_t size);
|
||||
int (* decrypt)(void *m2, int32_t type, uint8_t *buf, int32_t size);
|
||||
int (* decrypt)(void *m2, int32_t type, uint8_t *buf, intptr_t size);
|
||||
|
||||
} MULTI2;
|
||||
|
||||
|
||||
4
src/td.c
4
src/td.c
@ -1,3 +1,7 @@
|
||||
#if defined(WIN32)
|
||||
#define _CRT_SECURE_NO_WARNINGS
|
||||
#endif
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
@ -44,7 +44,7 @@ typedef struct {
|
||||
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
|
||||
static void release_ts_section_parser(void *parser);
|
||||
static int reset_ts_section_parser(void *parser);
|
||||
static int put_ts_section_parser(void *parser, TS_HEADER *hdr, uint8_t *data, int size);
|
||||
static int put_ts_section_parser(void *parser, TS_HEADER *hdr, uint8_t *data, intptr_t size);
|
||||
static int get_ts_section_parser(void *parser, TS_SECTION *sect);
|
||||
static int ret_ts_section_parser(void *parser, TS_SECTION *sect);
|
||||
static int get_count_ts_section_parser(void *parser);
|
||||
@ -94,11 +94,11 @@ TS_SECTION_PARSER *create_ts_section_parser()
|
||||
static TS_SECTION_PARSER_PRIVATE_DATA *private_data(void *parser);
|
||||
static void teardown(TS_SECTION_PARSER_PRIVATE_DATA *prv);
|
||||
|
||||
static int put_exclude_section_start(TS_SECTION_PARSER_PRIVATE_DATA *prv, uint8_t *data, int size);
|
||||
static int put_include_section_start(TS_SECTION_PARSER_PRIVATE_DATA *prv, uint8_t *data, int size);
|
||||
static int put_exclude_section_start(TS_SECTION_PARSER_PRIVATE_DATA *prv, uint8_t *data, intptr_t size);
|
||||
static int put_include_section_start(TS_SECTION_PARSER_PRIVATE_DATA *prv, uint8_t *data, intptr_t size);
|
||||
|
||||
static void reset_section(TS_SECTION *sect);
|
||||
static void append_section_data(TS_SECTION *sect, uint8_t *data, int size);
|
||||
static void append_section_data(TS_SECTION *sect, uint8_t *data, intptr_t size);
|
||||
static int check_section_complete(TS_SECTION *sect);
|
||||
|
||||
static int compare_elem_section(TS_SECTION_ELEM *a, TS_SECTION_ELEM *b);
|
||||
@ -152,7 +152,7 @@ static int reset_ts_section_parser(void *parser)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int put_ts_section_parser(void *parser, TS_HEADER *hdr, uint8_t *data, int size)
|
||||
static int put_ts_section_parser(void *parser, TS_HEADER *hdr, uint8_t *data, intptr_t size)
|
||||
{
|
||||
TS_SECTION_PARSER_PRIVATE_DATA *prv;
|
||||
|
||||
@ -287,7 +287,7 @@ static void teardown(TS_SECTION_PARSER_PRIVATE_DATA *prv)
|
||||
memset(&(prv->stat), 0, sizeof(TS_SECTION_PARSER_STAT));
|
||||
}
|
||||
|
||||
static int put_exclude_section_start(TS_SECTION_PARSER_PRIVATE_DATA *prv, uint8_t *data, int size)
|
||||
static int put_exclude_section_start(TS_SECTION_PARSER_PRIVATE_DATA *prv, uint8_t *data, intptr_t size)
|
||||
{
|
||||
TS_SECTION_ELEM *w;
|
||||
|
||||
@ -321,7 +321,7 @@ static int put_exclude_section_start(TS_SECTION_PARSER_PRIVATE_DATA *prv, uint8_
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int put_include_section_start(TS_SECTION_PARSER_PRIVATE_DATA *prv, uint8_t *data, int size)
|
||||
static int put_include_section_start(TS_SECTION_PARSER_PRIVATE_DATA *prv, uint8_t *data, intptr_t size)
|
||||
{
|
||||
TS_SECTION_ELEM *w;
|
||||
|
||||
@ -331,7 +331,7 @@ static int put_include_section_start(TS_SECTION_PARSER_PRIVATE_DATA *prv, uint8_
|
||||
uint8_t *tail;
|
||||
|
||||
int r;
|
||||
int length;
|
||||
intptr_t length;
|
||||
|
||||
p = data;
|
||||
tail = p + size;
|
||||
@ -415,9 +415,9 @@ static void reset_section(TS_SECTION *sect)
|
||||
sect->data = NULL;
|
||||
}
|
||||
|
||||
static void append_section_data(TS_SECTION *sect, uint8_t *data, int size)
|
||||
static void append_section_data(TS_SECTION *sect, uint8_t *data, intptr_t size)
|
||||
{
|
||||
int m,n;
|
||||
intptr_t m,n;
|
||||
|
||||
m = sect->tail - sect->raw;
|
||||
n = MAX_RAW_SECTION_SIZE - m;
|
||||
@ -448,7 +448,8 @@ static void append_section_data(TS_SECTION *sect, uint8_t *data, int size)
|
||||
|
||||
static int check_section_complete(TS_SECTION *sect)
|
||||
{
|
||||
int m,n;
|
||||
intptr_t m;
|
||||
int n;
|
||||
|
||||
if(sect->data == NULL){
|
||||
return 0;
|
||||
@ -466,7 +467,7 @@ static int check_section_complete(TS_SECTION *sect)
|
||||
|
||||
static int compare_elem_section(TS_SECTION_ELEM *a, TS_SECTION_ELEM *b)
|
||||
{
|
||||
int m,n;
|
||||
intptr_t m,n;
|
||||
|
||||
if( (a == NULL) || (b == NULL) ){
|
||||
return 1;
|
||||
@ -546,7 +547,7 @@ static TS_SECTION_ELEM *query_work_elem(TS_SECTION_PARSER_PRIVATE_DATA *prv)
|
||||
|
||||
static void extract_ts_section_header(TS_SECTION *sect)
|
||||
{
|
||||
int size;
|
||||
intptr_t size;
|
||||
uint8_t *p;
|
||||
|
||||
sect->data = NULL;
|
||||
|
||||
@ -17,7 +17,7 @@ typedef struct {
|
||||
|
||||
int (* reset)(void *parser);
|
||||
|
||||
int (* put)(void *parser, TS_HEADER *hdr, uint8_t *data, int size);
|
||||
int (* put)(void *parser, TS_HEADER *hdr, uint8_t *data, intptr_t size);
|
||||
int (* get)(void *parser, TS_SECTION *sect);
|
||||
int (* ret)(void *parser, TS_SECTION *sect);
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user