Skip to content

Commit 3e4c2cd

Browse files
agflineagfline
committed
fix unsafe symbols names #10 
1 parent 89ef970 commit 3e4c2cd

23 files changed

+524
-524
lines changed

‎include/libaaf/AAFIAudioFiles.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525

2626
#include <libaaf/AAFIface.h>
2727

28-
char * locate_external_essence_file( AAF_Iface *aafi, const wchar_t *original_file_path, const char *search_location );
28+
char * aafi_locate_external_essence_file( AAF_Iface *aafi, const wchar_t *original_file_path, const char *search_location );
2929

3030
int aafi_extract_audio_essence( AAF_Iface *aafi, aafiAudioEssence *audioEssence, const char *outfilepath, const wchar_t *forcedFileName );
3131

32-
int parse_audio_summary( AAF_Iface *aafi, aafiAudioEssence *audioEssence );
32+
int aafi_parse_audio_summary( AAF_Iface *aafi, aafiAudioEssence *audioEssence );
3333

3434

3535
#endif // !__AAFIAudioFiles_h__

‎include/libaaf/AAFIParser.h

+9-9
Original file line numberDiff line numberDiff line change
@@ -73,21 +73,21 @@ typedef struct trace_dump {
7373

7474

7575
#define DUMP_OBJ( aafi, Obj, __td ) \
76-
_DUMP_OBJ( aafi, Obj, __td, TD_OK, __LINE__, "" );
76+
aafi_dump_obj( aafi, Obj, __td, TD_OK, __LINE__, "" );
7777

7878
#define DUMP_OBJ_INFO( aafi, Obj, __td, ... ) \
79-
_DUMP_OBJ( aafi, Obj, __td, TD_OK, __LINE__, __VA_ARGS__ );
79+
aafi_dump_obj( aafi, Obj, __td, TD_OK, __LINE__, __VA_ARGS__ );
8080

8181
#define DUMP_OBJ_WARNING( aafi, Obj, __td, ... ) \
82-
_DUMP_OBJ( aafi, Obj, __td, TD_WARNING, __LINE__, __VA_ARGS__ );
82+
aafi_dump_obj( aafi, Obj, __td, TD_WARNING, __LINE__, __VA_ARGS__ );
8383

8484
#define DUMP_OBJ_ERROR( aafi, Obj, __td, ... ) \
8585
(__td)->eob = 1; \
86-
_DUMP_OBJ( aafi, Obj, __td, TD_ERROR, __LINE__, __VA_ARGS__ );
86+
aafi_dump_obj( aafi, Obj, __td, TD_ERROR, __LINE__, __VA_ARGS__ );
8787

8888
#define DUMP_OBJ_NO_SUPPORT( aafi, Obj, __td ) \
8989
(__td)->eob = 1; \
90-
_DUMP_OBJ_NO_SUPPORT( aafi, Obj, __td, __LINE__ );
90+
aafi_dump_obj_no_support( aafi, Obj, __td, __LINE__ );
9191

9292

9393

@@ -99,14 +99,14 @@ int aafi_retrieveData( AAF_Iface *aafi );
9999
* so they are accessible to vendor-specific files (Resolve.c, ProTools.c, etc.)
100100
*/
101101

102-
void _DUMP_OBJ( AAF_Iface *aafi, aafObject *Obj, struct trace_dump *__td, int state, int line, const char *fmt, ... );
102+
void aafi_dump_obj( AAF_Iface *aafi, aafObject *Obj, struct trace_dump *__td, int state, int line, const char *fmt, ... );
103103

104-
void _DUMP_OBJ_NO_SUPPORT( AAF_Iface *aafi, aafObject *Obj, struct trace_dump *__td, int line );
104+
void aafi_dump_obj_no_support( AAF_Iface *aafi, aafObject *Obj, struct trace_dump *__td, int line );
105105

106-
void trace_obj( AAF_Iface *aafi, aafObject *Obj, const char *color );
106+
void aafi_trace_obj( AAF_Iface *aafi, aafObject *Obj, const char *color );
107107

108108

109-
int parse_Segment( AAF_Iface *aafi, aafObject *Segment, td *__ptd );
109+
int aafi_parse_Segment( AAF_Iface *aafi, aafObject *Segment, td *__ptd );
110110

111111

112112
#endif // !__AAFIParser_h__

‎include/libaaf/AAFIface.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -934,11 +934,11 @@ void aafi_release( AAF_Iface **aafi );
934934
int aafi_load_file( AAF_Iface *aafi, const char * file );
935935

936936

937-
aafiTransition * get_fadein( aafiTimelineItem *audioItem );
937+
aafiTransition * aafi_get_fadein( aafiTimelineItem *audioItem );
938938

939-
aafiTransition * get_fadeout( aafiTimelineItem *audioItem );
939+
aafiTransition * aafi_get_fadeout( aafiTimelineItem *audioItem );
940940

941-
aafiTransition * get_xfade( aafiTimelineItem *audioItem );
941+
aafiTransition * aafi_get_xfade( aafiTimelineItem *audioItem );
942942

943943
aafiMarker * aafi_newMarker( AAF_Iface *aafi, aafRational_t *editRate, aafPosition_t start, aafPosition_t length, wchar_t *name, wchar_t *comment, uint16_t *RVBColor[3] );
944944

‎include/libaaf/AAFToText.h

+38-38
Original file line numberDiff line numberDiff line change
@@ -31,82 +31,82 @@
3131

3232

3333
#define AUIDToText( auid ) \
34-
CLSIDToText( (const cfbCLSID_t*)auid )
34+
cfb_CLSIDToText( (const cfbCLSID_t*)auid )
3535

3636

37-
const wchar_t * MobIDToText( aafMobID_t *mobid );
37+
const wchar_t * aaft_MobIDToText( aafMobID_t *mobid );
3838

39-
const wchar_t * TimestampToText( aafTimeStamp_t *ts );
39+
const wchar_t * aaft_TimestampToText( aafTimeStamp_t *ts );
4040

41-
const wchar_t * VersionToText( aafVersionType_t *vers );
41+
const wchar_t * aaft_VersionToText( aafVersionType_t *vers );
4242

43-
const wchar_t * ProductVersionToText( aafProductVersion_t *vers );
43+
const wchar_t * aaft_ProductVersionToText( aafProductVersion_t *vers );
4444

45-
const wchar_t * FileKindToText( const aafUID_t *auid );
45+
const wchar_t * aaft_FileKindToText( const aafUID_t *auid );
4646

47-
const wchar_t * TapeCaseTypeToText( aafTapeCaseType_t t );
47+
const wchar_t * aaft_TapeCaseTypeToText( aafTapeCaseType_t t );
4848

49-
const wchar_t * VideoSignalTypeToText( aafVideoSignalType_t v );
49+
const wchar_t * aaft_VideoSignalTypeToText( aafVideoSignalType_t v );
5050

51-
const wchar_t * TapeFormatTypeToText( aafTapeFormatType_t t );
51+
const wchar_t * aaft_TapeFormatTypeToText( aafTapeFormatType_t t );
5252

53-
const wchar_t * FilmTypeToText( aafFilmType_t f );
53+
const wchar_t * aaft_FilmTypeToText( aafFilmType_t f );
5454

55-
const wchar_t * SignalStandardToText( aafSignalStandard_t s );
55+
const wchar_t * aaft_SignalStandardToText( aafSignalStandard_t s );
5656

57-
const wchar_t * FieldNumberToText( aafFieldNumber_t f );
57+
const wchar_t * aaft_FieldNumberToText( aafFieldNumber_t f );
5858

59-
const wchar_t * AlphaTransparencyToText( aafAlphaTransparency_t a );
59+
const wchar_t * aaft_AlphaTransparencyToText( aafAlphaTransparency_t a );
6060

61-
const wchar_t * FrameLayoutToText( aafFrameLayout_t f );
61+
const wchar_t * aaft_FrameLayoutToText( aafFrameLayout_t f );
6262

63-
const wchar_t * ColorSitingToText( aafColorSiting_t c );
63+
const wchar_t * aaft_ColorSitingToText( aafColorSiting_t c );
6464

65-
const wchar_t * ProductReleaseTypeToText( aafProductReleaseType_t t );
65+
const wchar_t * aaft_ProductReleaseTypeToText( aafProductReleaseType_t t );
6666

67-
const wchar_t * FadeTypeToText( aafFadeType_t f );
67+
const wchar_t * aaft_FadeTypeToText( aafFadeType_t f );
6868

69-
const wchar_t * BoolToText( aafBoolean_t b );
69+
const wchar_t * aaft_BoolToText( aafBoolean_t b );
7070

71-
const wchar_t * OperationCategoryToText( const aafUID_t *auid );
71+
const wchar_t * aaft_OperationCategoryToText( const aafUID_t *auid );
7272

73-
const wchar_t * PluginCategoryToText( const aafUID_t *auid );
73+
const wchar_t * aaft_PluginCategoryToText( const aafUID_t *auid );
7474

75-
const wchar_t * ScanningDirectionToText( aafScanningDirection_t s );
75+
const wchar_t * aaft_ScanningDirectionToText( aafScanningDirection_t s );
7676

77-
const wchar_t * ByteOrderToText( int16_t e );
77+
const wchar_t * aaft_ByteOrderToText( int16_t e );
7878

79-
const wchar_t * ElectroSpatialToText( aafElectroSpatialFormulation_t e );
79+
const wchar_t * aaft_ElectroSpatialToText( aafElectroSpatialFormulation_t e );
8080

81-
const wchar_t * TypeIDToText( const aafUID_t *auid );
81+
const wchar_t * aaft_TypeIDToText( const aafUID_t *auid );
8282

83-
const wchar_t * StoredFormToText( enum aafStoredForm_e sf );
83+
const wchar_t * aaft_StoredFormToText( enum aafStoredForm_e sf );
8484

85-
const wchar_t * OPDefToText( const aafUID_t *auid );
85+
const wchar_t * aaft_OPDefToText( const aafUID_t *auid );
8686

87-
const wchar_t * DataDefToText( AAF_Data *aafd, const aafUID_t *auid );
87+
const wchar_t * aaft_DataDefToText( AAF_Data *aafd, const aafUID_t *auid );
8888

89-
const wchar_t * OperationDefToText( AAF_Data *aafd, const aafUID_t *auid );
89+
const wchar_t * aaft_OperationDefToText( AAF_Data *aafd, const aafUID_t *auid );
9090

91-
const wchar_t * InterpolationToText( const aafUID_t *auid );
91+
const wchar_t * aaft_InterpolationToText( const aafUID_t *auid );
9292

93-
const wchar_t * ParameterToText( AAF_Data *aafd, const aafUID_t *auid );
93+
const wchar_t * aaft_ParameterToText( AAF_Data *aafd, const aafUID_t *auid );
9494

95-
const wchar_t * TransferCharacteristicToText( const aafUID_t *auid );
95+
const wchar_t * aaft_TransferCharacteristicToText( const aafUID_t *auid );
9696

97-
const wchar_t * CodingEquationsToText( const aafUID_t *auid );
97+
const wchar_t * aaft_CodingEquationsToText( const aafUID_t *auid );
9898

99-
const wchar_t * ColorPrimariesToText( const aafUID_t *auid );
99+
const wchar_t * aaft_ColorPrimariesToText( const aafUID_t *auid );
100100

101-
const wchar_t * UsageCodeToText( const aafUID_t *auid );
101+
const wchar_t * aaft_UsageCodeToText( const aafUID_t *auid );
102102

103-
const wchar_t * PIDToText( AAF_Data *aafd, aafPID_t pid );
103+
const wchar_t * aaft_PIDToText( AAF_Data *aafd, aafPID_t pid );
104104

105-
const wchar_t * ClassIDToText( AAF_Data *aafd, const aafUID_t *auid );
105+
const wchar_t * aaft_ClassIDToText( AAF_Data *aafd, const aafUID_t *auid );
106106

107-
const wchar_t * ContainerToText( const aafUID_t *auid );
107+
const wchar_t * aaft_ContainerToText( const aafUID_t *auid );
108108

109-
const wchar_t * CompressionToText( const aafUID_t *auid );
109+
const wchar_t * aaft_CompressionToText( const aafUID_t *auid );
110110

111111

112112
#endif // !__AAFToText_h__

‎include/libaaf/LibCFB.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -842,7 +842,7 @@ typedef struct CFB_Data
842842
*/
843843

844844

845-
const wchar_t * CLSIDToText( const cfbCLSID_t *clsid );
845+
const wchar_t * cfb_CLSIDToText( const cfbCLSID_t *clsid );
846846

847847
wchar_t * cfb_w16towchar( wchar_t *buf, uint16_t *w16buf, size_t w16blen );
848848

‎include/libaaf/debug.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,11 @@ struct dbg {
8989

9090

9191

92-
struct dbg * new_debug( void );
92+
struct dbg * laaf_new_debug( void );
9393

94-
void free_debug( struct dbg *dbg );
94+
void laaf_free_debug( struct dbg *dbg );
9595

96-
void debug_callback( struct dbg *dbg, void *ctxdata, int lib, int type, const char *srcfile, const char *srcfunc, int lineno, const char *msg, void *user );
96+
void laaf_debug_callback( struct dbg *dbg, void *ctxdata, int lib, int type, const char *srcfile, const char *srcfunc, int lineno, const char *msg, void *user );
9797

9898

9999
#endif // !__debug_h__

0 commit comments

Comments
 (0)