From 7f41381e1de5cfc9d326f417274a0c80241e1bc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Vasseur?= Date: Mon, 11 Dec 2017 16:21:42 +0000 Subject: [PATCH] Fix invalid suffix on literal C++11 requires a space between literal and string macro. --- dvb/si/desc_44.h | 4 ++-- dvb/si/desc_5a.h | 4 ++-- scte/35_print.h | 36 ++++++++++++++++++------------------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dvb/si/desc_44.h b/dvb/si/desc_44.h index 781b4ff..1c916c1 100644 --- a/dvb/si/desc_44.h +++ b/dvb/si/desc_44.h @@ -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, - "", + "", 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))); diff --git a/dvb/si/desc_5a.h b/dvb/si/desc_5a.h index 6fe4d38..ac846ba 100644 --- a/dvb/si/desc_5a.h +++ b/dvb/si/desc_5a.h @@ -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, - "", + "", 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, diff --git a/scte/35_print.h b/scte/35_print.h index e8324fc..328b67d 100644 --- a/scte/35_print.h +++ b/scte/35_print.h @@ -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_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_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_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_TIME_SIGNAL_COMMAND, i_pts_adjustment, scte35_splice_time_get_pts_time(p_splice_time)); else pf_print(print_opaque, - "", + "", 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_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, - "", + "", 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); } }