File gnumeric-1.10.17-hhx.patch of Package mingw64-gnumeric
--- gnumeric-1.10.17/plugins/excel/ms-escher.c 2010-04-24 04:31:21.000000000 +0200
+++ gnumeric-1.10.17/plugins/excel/ms-escher.c 2013-04-13 09:06:55.728407974 +0200
@@ -487,7 +487,7 @@
needs_free = FALSE;
} else {
failure = TRUE;
- g_warning ("Unknown compression type %hhx;", compress);
+ g_warning ("Unknown compression type %02x;", compress);
}
if (needs_free)
g_free ((guint8*)tmp);
--- gnumeric-1.10.17/plugins/excel/xls-read-pivot.c 2011-01-22 15:43:14.000000000 +0100
+++ gnumeric-1.10.17/plugins/excel/xls-read-pivot.c 2013-04-13 10:12:58.070702442 +0200
@@ -114,14 +114,14 @@
case BIFF_SXERR: if (check_next (q, 2)) {
gint16 v = GSF_LE_GET_GINT16 (q->data + 0);
- d (1, fprintf (stderr, "%hx (err);\n", v););
+ d (1, fprintf (stderr, "%04x (err);\n", v););
return xls_value_new_err (NULL, v);
}
break;
case BIFF_SXINT: if (check_next (q, 2)) {
gint16 v = GSF_LE_GET_GINT16 (q->data + 0);
- d (1, fprintf (stderr, "%hx (short);\n", v););
+ d (1, fprintf (stderr, "%04x (short);\n", v););
return go_val_new_float (v);
}
break;
@@ -142,8 +142,8 @@
guint8 se = GSF_LE_GET_GUINT8 (q->data + 7);
GDate date;
- d (1, fprintf (stderr, "%hu-%hu-%hhuT%hhu:%hhu:%hhu (data);\n",
- y, m, d, h, mi, se););
+ d (1, fprintf (stderr, "%u-%u-%uT%u:%u:%u (data);\n",
+ (unsigned short)y, (unsigned short)m, (unsigned char)d, (unsigned char)h, (unsigned char)mi, (unsigned char)se););
g_date_set_dmy (&date, d, m, y);
if (g_date_valid (&date)) {
@@ -164,7 +164,7 @@
}
default :
- d (0, fprintf (stderr, "UNEXPECTED RECORD %hx;\n", opcode););
+ d (0, fprintf (stderr, "UNEXPECTED RECORD %04x;\n", opcode););
break;
}
}
@@ -214,7 +214,7 @@
go_val_bucketer_init (&bucketer);
bucketer.details.series.step = 1.;
- d (0, fprintf (stderr, "group with 0x%hx flag type = %d;\n", flags, type););
+ d (0, fprintf (stderr, "group with 0x%04x flag type = %d;\n", flags, type););
switch (type) {
case 1 : bucketer.type = GO_VAL_BUCKET_SECOND; break;
case 2 : bucketer.type = GO_VAL_BUCKET_MINUTE; break;
@@ -318,7 +318,7 @@
guint16 std_items = GSF_LE_GET_GUINT16 (q->data + 12);
GOString *name = go_string_new_nocopy (excel_biff_text_2 (s->imp, q, 14));
- d(0, fprintf (stderr, "FIELD [%d] '%s' type %d, has %d %d %d %d items, and flags = 0x%hx, parent = %d, child = %d;\n",
+ d(0, fprintf (stderr, "FIELD [%d] '%s' type %d, has %d %d %d %d items, and flags = 0x%04x, parent = %d, child = %d;\n",
field_num, name ? name->str : "<UNDEFINED>", index_type, count, grouped_items, base_items, std_items, flags,
group_parent, group_child););
@@ -388,10 +388,10 @@
guint16 base_fields = GSF_LE_GET_GUINT16 (q->data + 10); /* base */
/* guint16 zero */
guint16 type = GSF_LE_GET_GUINT16 (q->data + 16);
- fprintf (stderr, "num_rec = %u;\nstream_id = %hu;\n"
- "rec per block = %hu;\nbase fields = %hu;\ntotal fields = %hu;\n"
+ fprintf (stderr, "num_rec = %u;\nstream_id = %u;\n"
+ "rec per block = %u;\nbase fields = %u;\ntotal fields = %u;\n"
"last modified by = '%s';type = 0x%x, flags = 0x%x;\n",
- num_records, stream_id, rec_per_block, base_fields,
+ num_records, (unsigned short)stream_id, (unsigned short)rec_per_block, (unsigned short)base_fields,
num_fields, refreshedBy, type, flags);
});
g_free (refreshedBy);
@@ -413,7 +413,7 @@
if (ms_biff_query_peek_next (q, &opcode) && opcode == BIFF_SXFDB && check_next_min (q, 12))
xls_read_pivot_cache_field (s, q, i);
else {
- fprintf (stderr, "expected FDB not %hx\n", opcode);
+ fprintf (stderr, "expected FDB not %04x\n", opcode);
return FALSE;
}
@@ -426,7 +426,7 @@
go_data_cache_set_index (s->cache,
g_array_index (s->indexed, unsigned int, i), record_count,
GSF_LE_GET_GINT8 (q->data + i));
- d (1, fprintf (stderr, "%hhu ", GSF_LE_GET_GINT8 (q->data + i)););
+ d (1, fprintf (stderr, "%u ", (unsigned char)GSF_LE_GET_GINT8 (q->data + i)););
}
d (1, fprintf (stderr, "\n"); );
@@ -550,7 +550,7 @@
case BIFF_DCONBIN: g_print ("Sheet : binname\n");
break;
default:
- g_print ("missing sheet type : %hx\n", source_type);
+ g_print ("missing sheet type : %04x\n", source_type);
break;
}
break;
@@ -565,7 +565,7 @@
break;
default :
- g_print ("unknown source type : %hx\n", source_type);
+ g_print ("unknown source type : %04x\n", source_type);
break;
}
}
@@ -636,11 +636,11 @@
case 0x0D: type_str = "Grand total"; break;
default : type_str = "UNKNOWN"; break;
}
- g_print ("[%u] %s %s %s %s %s = %hu\n", i, type_str,
+ g_print ("[%u] %s %s %s %s %s = %u\n", i, type_str,
(flags & 1) ? "hidden " : "",
(flags & 2) ? "detailHid " : "",
(flags & 4) ? "calc " : "",
- (flags & 8) ? "missing " : "", cache_index);
+ (flags & 8) ? "missing " : "", (unsigned short)cache_index);
});
if (type == 0x00 && (flags & 1))
--- gnumeric-1.10.17/plugins/xbase/xbase.c 2011-03-09 13:29:36.000000000 +0100
+++ gnumeric-1.10.17/plugins/xbase/xbase.c 2013-04-13 10:16:37.609036298 +0200
@@ -243,7 +243,7 @@
#endif
break;
default:
- g_printerr ("unknown 0x%hhx\n", hdr[0]);
+ g_printerr ("unknown 0x%02x\n", hdr[0]);
}
x->records = GSF_LE_GET_GUINT32 (hdr + 4);
