Improve SQLGUID format handling.

diff --git a/convert.c b/convert.c
index 0d07612828fbcaf68819a68e8d336fc5790a1544..aa98eb03d4d69b8b2bb9cbdc1f96fb090d392536 100644 (file)
--- a/convert.c
+++ b/convert.c
@@ -1548,9 +1548,9 @@ inolog("SQL_C_VARBOOKMARK value=%d\n", ival);
            case SQL_C_GUID:
 
                if (sscanf(neut_str,
-               "%08lX-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X",
+               "%08X-%04hX-%04hX-%02hhX%02hhX-%02hhX%02hhX%02hhX%02hhX%02hhX%02hhX",
                &g.Data1,
-               &g.Data2,& g.Data3,
+               &g.Data2, &g.Data3,
                &g.Data4[0], &g.Data4[1], &g.Data4[2], &g.Data4[3],
                &g.Data4[4], &g.Data4[5], &g.Data4[6], &g.Data4[7]) < 11)
                {
@@ -3798,8 +3798,8 @@ mylog("C_WCHAR=%s(%d)\n", buffer, used);
        {
            SQLGUID *g = (SQLGUID *) buffer;
            snprintf (param_string, sizeof(param_string),
-               "%08lX-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X",
-               (unsigned long) g->Data1,
+               "%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X",
+               g->Data1,
                g->Data2, g->Data3,
                g->Data4[0], g->Data4[1], g->Data4[2], g->Data4[3],
                g->Data4[4], g->Data4[5], g->Data4[6], g->Data4[7]);