Browse Source

Fix invalid suffix on literal

C++11 requires a space between literal and string macro.
master
Clément Vasseur 7 years ago
parent
commit
7f41381e1d
3 changed files with 22 additions and 22 deletions
  1. +2
    -2
      dvb/si/desc_44.h
  2. +2
    -2
      dvb/si/desc_5a.h
  3. +18
    -18
      scte/35_print.h

+ 2
- 2
dvb/si/desc_44.h View File

@ -128,14 +128,14 @@ static inline void desc44_print(const uint8_t *p_desc, f_print pf_print,
switch (i_print_type) {
case PRINT_XML:
pf_print(opaque,
"<CABLE_DESC frequency=\"%"PRIu64"\" fecouter=\"%s\" modulation=\"%s\" symbolrate=\"%u\" fecinner=\"%s\"/>",
"<CABLE_DESC frequency=\"%" PRIu64 "\" fecouter=\"%s\" modulation=\"%s\" symbolrate=\"%u\" fecinner=\"%s\"/>",
desc44_get_frequency(p_desc), psz_fecouter, psz_modulation,
desc44_get_symbolrate(p_desc),
dvb_delivery_get_fec(desc43_get_fecinner(p_desc)));
break;
default:
pf_print(opaque,
" - desc 44 dvb-c frequency=%"PRIu64" Hz fecouter=%s modulation=%s symbolrate=%u fecinner=%s",
" - desc 44 dvb-c frequency=%" PRIu64 " Hz fecouter=%s modulation=%s symbolrate=%u fecinner=%s",
desc44_get_frequency(p_desc), psz_fecouter, psz_modulation,
desc44_get_symbolrate(p_desc),
dvb_delivery_get_fec(desc43_get_fecinner(p_desc)));

+ 2
- 2
dvb/si/desc_5a.h View File

@ -247,7 +247,7 @@ static inline void desc5a_print(const uint8_t *p_desc, f_print pf_print,
switch (i_print_type) {
case PRINT_XML:
pf_print(opaque,
"<TERRESTRIAL_DESC frequency=\"%"PRIu64"\" bandwidth=\"%u\" priority=\"%s\" timeslicing=\"%d\" mpefec=\"%d\" constellation=\"%s\" hierarchy=\"%s\" coderatehp=\"%s\" coderatelp=\"%s\" guard=\"%s\" transmission=\"%s\" otherfrequency=\"%d\"/>",
"<TERRESTRIAL_DESC frequency=\"%" PRIu64 "\" bandwidth=\"%u\" priority=\"%s\" timeslicing=\"%d\" mpefec=\"%d\" constellation=\"%s\" hierarchy=\"%s\" coderatehp=\"%s\" coderatelp=\"%s\" guard=\"%s\" transmission=\"%s\" otherfrequency=\"%d\"/>",
desc5a_get_frequency(p_desc), i_bandwidth,
desc5a_get_priority(p_desc) ? "HP" : "LP",
desc5a_get_timeslicing(p_desc) ? 1 : 0,
@ -260,7 +260,7 @@ static inline void desc5a_print(const uint8_t *p_desc, f_print pf_print,
break;
default:
pf_print(opaque,
" - desc 5a dvb-t frequency=%"PRIu64" Hz bandwidth=%u MHz priority=%s timeslicing=%d mpefec=%d constellation=%s hierarchy=%s coderatehp=%s coderatelp=%s guard=%s transmission=%s otherfrequency=%d",
" - desc 5a dvb-t frequency=%" PRIu64 " Hz bandwidth=%u MHz priority=%s timeslicing=%d mpefec=%d constellation=%s hierarchy=%s coderatehp=%s coderatelp=%s guard=%s transmission=%s otherfrequency=%d",
desc5a_get_frequency(p_desc), i_bandwidth,
desc5a_get_priority(p_desc) ? "HP" : "LP",
desc5a_get_timeslicing(p_desc) ? 1 : 0,

+ 18
- 18
scte/35_print.h View File

@ -62,12 +62,12 @@ static inline void scte35_null_print(const uint8_t *p_scte35,
switch (i_print_type) {
case PRINT_XML:
pf_print(print_opaque,
"<SCTE35 command=\"%"PRIu8"\" command_str=\"null\" pts_adjustment=\"%"PRIu64"\">",
"<SCTE35 command=\"%" PRIu8 "\" command_str=\"null\" pts_adjustment=\"%" PRIu64 "\">",
SCTE35_NULL_COMMAND, i_pts_adjustment);
break;
default:
pf_print(print_opaque,
"new SCTE35 command=%"PRIu8" command_str=null pts_adjustment=%"PRIu64,
"new SCTE35 command=%" PRIu8 " command_str=null pts_adjustment=%" PRIu64,
SCTE35_NULL_COMMAND, i_pts_adjustment);
}
}
@ -82,12 +82,12 @@ static inline void scte35_insert_print(const uint8_t *p_scte35,
switch (i_print_type) {
case PRINT_XML:
pf_print(print_opaque,
"<SCTE35 command=\"%"PRIu8"\" command_str=\"insert\" pts_adjustment=\"%"PRIu64"\" event_id=\"%"PRIu32"\" cancel=\"1\">",
"<SCTE35 command=\"%" PRIu8 "\" command_str=\"insert\" pts_adjustment=\"%" PRIu64 "\" event_id=\"%" PRIu32 "\" cancel=\"1\">",
SCTE35_INSERT_COMMAND, i_pts_adjustment, i_event_id);
break;
default:
pf_print(print_opaque,
"new SCTE35 command=%"PRIu8" command_str=insert pts_adjustment=%"PRIu64" event_id=%"PRIu32" cancel=true",
"new SCTE35 command=%" PRIu8 " command_str=insert pts_adjustment=%" PRIu64 " event_id=%" PRIu32 " cancel=true",
SCTE35_INSERT_COMMAND, i_pts_adjustment, i_event_id);
}
return;
@ -113,12 +113,12 @@ static inline void scte35_insert_print(const uint8_t *p_scte35,
switch (i_print_type) {
case PRINT_XML:
snprintf(psz_duration, 255,
" auto_return=\"%d\" duration=\"%"PRIu64"\"",
" auto_return=\"%d\" duration=\"%" PRIu64 "\"",
b_auto_return ? 1 : 0, i_duration);
break;
default:
snprintf(psz_duration, 255,
" auto_return=%s duration=%"PRIu64"",
" auto_return=%s duration=%" PRIu64 "",
b_auto_return ? "true" : "false", i_duration);
}
}
@ -157,11 +157,11 @@ static inline void scte35_insert_print(const uint8_t *p_scte35,
switch (i_print_type) {
case PRINT_XML:
snprintf(psz_splice_time, 255, " splice_time=\"%"PRIu64"\"",
snprintf(psz_splice_time, 255, " splice_time=\"%" PRIu64 "\"",
i_pts_time);
break;
default:
snprintf(psz_splice_time, 255, " splice_time=%"PRIu64"",
snprintf(psz_splice_time, 255, " splice_time=%" PRIu64 "",
i_pts_time);
}
}
@ -170,14 +170,14 @@ static inline void scte35_insert_print(const uint8_t *p_scte35,
switch (i_print_type) {
case PRINT_XML:
pf_print(print_opaque,
"<SCTE35 command=\"%"PRIu8"\" command_str=\"insert\" pts_adjustment=\"%"PRIu64"\" event_id=\"%"PRIu32"\" cancel=\"0\" out_of_network=\"%d\" program_splice=\"%d\"%s%s unique_program_id=\"%"PRIu16"\">",
"<SCTE35 command=\"%" PRIu8 "\" command_str=\"insert\" pts_adjustment=\"%" PRIu64 "\" event_id=\"%" PRIu32 "\" cancel=\"0\" out_of_network=\"%d\" program_splice=\"%d\"%s%s unique_program_id=\"%" PRIu16 "\">",
SCTE35_INSERT_COMMAND, i_pts_adjustment, i_event_id,
b_out_of_network ? 1 : 0, b_program_splice ? 1 : 0,
psz_splice_time, psz_duration, i_unique_program_id);
break;
default:
pf_print(print_opaque,
"new SCTE35 command=%"PRIu8" command_str=insert pts_adjustment=%"PRIu64" event_id=%"PRIu32" cancel=false out_of_network=%s program_splice=%s%s%s unique_program_id=%"PRIu16,
"new SCTE35 command=%" PRIu8 " command_str=insert pts_adjustment=%" PRIu64 " event_id=%" PRIu32 " cancel=false out_of_network=%s program_splice=%s%s%s unique_program_id=%" PRIu16,
SCTE35_INSERT_COMMAND, i_pts_adjustment, i_event_id,
b_out_of_network ? "true" : "false",
b_program_splice ? "true" : "false",
@ -195,23 +195,23 @@ static inline void scte35_time_signal_print(const uint8_t *p_scte35,
case PRINT_XML:
if (scte35_splice_time_has_time_specified(p_splice_time))
pf_print(print_opaque,
"<SCTE35 command=\"%"PRIu8"\" command_str=\"time_signal\" pts_adjustment=\"%"PRIu64"\" splice_time=\"%"PRIu64"\">",
"<SCTE35 command=\"%" PRIu8 "\" command_str=\"time_signal\" pts_adjustment=\"%" PRIu64 "\" splice_time=\"%" PRIu64 "\">",
SCTE35_TIME_SIGNAL_COMMAND, i_pts_adjustment,
scte35_splice_time_get_pts_time(p_splice_time));
else
pf_print(print_opaque,
"<SCTE35 command=\"%"PRIu8"\" command_str=\"time_signal\" pts_adjustment=\"%"PRIu64"\" splice_time=\"undefined\">",
"<SCTE35 command=\"%" PRIu8 "\" command_str=\"time_signal\" pts_adjustment=\"%" PRIu64 "\" splice_time=\"undefined\">",
SCTE35_TIME_SIGNAL_COMMAND, i_pts_adjustment);
break;
default:
if (scte35_splice_time_has_time_specified(p_splice_time))
pf_print(print_opaque,
"new SCTE35 command=%"PRIu8" command_str=time_signal pts_adjustment=%"PRIu64" splice_time=%"PRIu64,
"new SCTE35 command=%" PRIu8 " command_str=time_signal pts_adjustment=%" PRIu64 " splice_time=%" PRIu64,
SCTE35_TIME_SIGNAL_COMMAND, i_pts_adjustment,
scte35_splice_time_get_pts_time(p_splice_time));
else
pf_print(print_opaque,
"new SCTE35 command=%"PRIu8" command_str=time_signal pts_adjustment=%"PRIu64" splice_time=undefined",
"new SCTE35 command=%" PRIu8 " command_str=time_signal pts_adjustment=%" PRIu64 " splice_time=undefined",
SCTE35_TIME_SIGNAL_COMMAND, i_pts_adjustment);
}
}
@ -225,12 +225,12 @@ static inline void scte35_private_print(const uint8_t *p_scte35,
switch (i_print_type) {
case PRINT_XML:
pf_print(print_opaque,
"<SCTE35 command=\"%"PRIu8"\" command_str=\"private\" pts_adjustment=\"%"PRIu64"\" identifier=\"%"PRIu32"\" />",
"<SCTE35 command=\"%" PRIu8 "\" command_str=\"private\" pts_adjustment=\"%" PRIu64 "\" identifier=\"%" PRIu32 "\" />",
SCTE35_PRIVATE_COMMAND, i_pts_adjustment, i_identifier);
break;
default:
pf_print(print_opaque,
"new SCTE35 command=%"PRIu8" command_str=private pts_adjustment=%"PRIu64" identifier=%"PRIu32,
"new SCTE35 command=%" PRIu8 " command_str=private pts_adjustment=%" PRIu64 " identifier=%" PRIu32,
SCTE35_PRIVATE_COMMAND, i_pts_adjustment, i_identifier);
}
}
@ -268,12 +268,12 @@ static inline void scte35_print(const uint8_t *p_scte35,
switch (i_print_type) {
case PRINT_XML:
pf_print(print_opaque,
"<SCTE35 command=\"%"PRIu8"\" command_str=\"%s\" pts_adjustment=\"%"PRIu64"\">",
"<SCTE35 command=\"%" PRIu8 "\" command_str=\"%s\" pts_adjustment=\"%" PRIu64 "\">",
i_type, scte35_get_command_type_txt(i_type), i_pts_adjustment);
break;
default:
pf_print(print_opaque,
"new SCTE35 command=%"PRIu8" command_str=%s pts_adjustment=%"PRIu64,
"new SCTE35 command=%" PRIu8 " command_str=%s pts_adjustment=%" PRIu64,
i_type, scte35_get_command_type_txt(i_type), i_pts_adjustment);
}
}

Loading…
Cancel
Save