Replace g_strdup_printf() with ws_strdup_printf()

Use macros from inttypes.h.

1 files changed, 11 insertions, 11 deletions

diff --git a/wiretap/k12.c b/wiretap/k12.c
index e5e145cd5a..de4c48149d 100644
--- a/wiretap/k12.c
+++ b/wiretap/k12.c
@@ -484,12 +484,12 @@ static gint get_record(k12_t *file_data, FILE_T fh, gint64 file_offset,
      */
     if (left < 8) {
         *err = WTAP_ERR_BAD_FILE;
-        *err_info = g_strdup_printf("k12: Record length %u is less than 8 bytes long",left);
+        *err_info = ws_strdup_printf("k12: Record length %u is less than 8 bytes long",left);
         return -1;
     }
     if (left > WTAP_MAX_PACKET_SIZE_STANDARD) {
         *err = WTAP_ERR_BAD_FILE;
-        *err_info = g_strdup_printf("k12: Record length %u is greater than the maximum %u",left,WTAP_MAX_PACKET_SIZE_STANDARD);
+        *err_info = ws_strdup_printf("k12: Record length %u is greater than the maximum %u",left,WTAP_MAX_PACKET_SIZE_STANDARD);
         return -1;
     }
 
@@ -582,7 +582,7 @@ process_packet_data(wtap_rec *rec, Buffer *target, guint8 *buffer,
     buffer_offset = (type == K12_REC_D0020) ? K12_PACKET_FRAME_D0020 : K12_PACKET_FRAME;
     if (buffer_offset > record_len) {
         *err = WTAP_ERR_BAD_FILE;
-        *err_info = g_strdup_printf("k12: Frame data offset %u > record length %u",
+        *err_info = ws_strdup_printf("k12: Frame data offset %u > record length %u",
                                     buffer_offset, record_len);
         return FALSE;
     }
@@ -590,7 +590,7 @@ process_packet_data(wtap_rec *rec, Buffer *target, guint8 *buffer,
     length = pntoh32(buffer + K12_RECORD_FRAME_LEN) & 0x00001FFF;
     if (length > record_len - buffer_offset) {
         *err = WTAP_ERR_BAD_FILE;
-        *err_info = g_strdup_printf("k12: Frame length %u > record frame data %u",
+        *err_info = ws_strdup_printf("k12: Frame length %u > record frame data %u",
                                     length, record_len - buffer_offset);
         return FALSE;
     }
@@ -699,7 +699,7 @@ static gboolean k12_read(wtap *wth, wtap_rec *rec, Buffer *buf, int *err, gchar
         } else if (len < K12_RECORD_SRC_ID + 4) {
             /* Record not large enough to contain a src ID */
             *err = WTAP_ERR_BAD_FILE;
-            *err_info = g_strdup_printf("k12: Data record length %d too short", len);
+            *err_info = ws_strdup_printf("k12: Data record length %d too short", len);
             return FALSE;
         }
         k12->num_of_records--;
@@ -884,7 +884,7 @@ wtap_open_return_val k12_open(wtap *wth, int *err, gchar **err_info) {
         file_data->num_of_records = pntoh32( header_buffer + K12_FILE_HDR_RECORD_COUNT_1 );
         if ( file_data->num_of_records != pntoh32( header_buffer + K12_FILE_HDR_RECORD_COUNT_2 ) ) {
             *err = WTAP_ERR_BAD_FILE;
-            *err_info = g_strdup_printf("k12: two different record counts, %u at 0x%02x and %u at 0x%02x",
+            *err_info = ws_strdup_printf("k12: two different record counts, %u at 0x%02x and %u at 0x%02x",
                                         file_data->num_of_records,
                                         K12_FILE_HDR_RECORD_COUNT_1,
                                         pntoh32( header_buffer + K12_FILE_HDR_RECORD_COUNT_2 ),
@@ -926,7 +926,7 @@ wtap_open_return_val k12_open(wtap *wth, int *err, gchar **err_info) {
         if (rec_len < K12_RECORD_TYPE + 4) {
             /* Record isn't long enough to have a type field */
             *err = WTAP_ERR_BAD_FILE;
-            *err_info = g_strdup_printf("k12: record length %u < %u",
+            *err_info = ws_strdup_printf("k12: record length %u < %u",
                                         rec_len, K12_RECORD_TYPE + 4);
             destroy_k12_file_data(file_data);
             return WTAP_OPEN_ERROR;
@@ -958,7 +958,7 @@ wtap_open_return_val k12_open(wtap *wth, int *err, gchar **err_info) {
                  * of the source descriptor field.
                  */
                 *err = WTAP_ERR_BAD_FILE;
-                *err_info = g_strdup_printf("k12: source descriptor record length %u < %u",
+                *err_info = ws_strdup_printf("k12: source descriptor record length %u < %u",
                                             rec_len, K12_SRCDESC_HWPART);
                 destroy_k12_file_data(file_data);
                 g_free(rec);
@@ -991,7 +991,7 @@ wtap_open_return_val k12_open(wtap *wth, int *err, gchar **err_info) {
                  * field, including the variable-length parts.
                  */
                 *err = WTAP_ERR_BAD_FILE;
-                *err_info = g_strdup_printf("k12: source descriptor record length %u < %u (%u + %u + %u + %u)",
+                *err_info = ws_strdup_printf("k12: source descriptor record length %u < %u (%u + %u + %u + %u)",
                                             rec_len,
                                             K12_SRCDESC_HWPART + hwpart_len + name_len + stack_len,
                                             K12_SRCDESC_HWPART, hwpart_len, name_len, stack_len);
@@ -1004,7 +1004,7 @@ wtap_open_return_val k12_open(wtap *wth, int *err, gchar **err_info) {
                 if (hwpart_len < 4) {
                     /* Hardware part isn't long enough to have a type field */
                     *err = WTAP_ERR_BAD_FILE;
-                    *err_info = g_strdup_printf("k12: source descriptor hardware part length %u < 4",
+                    *err_info = ws_strdup_printf("k12: source descriptor hardware part length %u < 4",
                                                 hwpart_len);
                     destroy_k12_file_data(file_data);
                     g_free(rec);
@@ -1024,7 +1024,7 @@ wtap_open_return_val k12_open(wtap *wth, int *err, gchar **err_info) {
                         if (hwpart_len < K12_SRCDESC_ATM_VCI + 2) {
                             /* Hardware part isn't long enough to have ATM information */
                             *err = WTAP_ERR_BAD_FILE;
-                            *err_info = g_strdup_printf("k12: source descriptor hardware part length %u < %u",
+                            *err_info = ws_strdup_printf("k12: source descriptor hardware part length %u < %u",
                                                         hwpart_len,
                                                         K12_SRCDESC_ATM_VCI + 2);
                             destroy_k12_file_data(file_data);