epan: Convert to use stdio.h from GLib

Replace:
    g_snprintf() -> snprintf()
    g_vsnprintf() -> vsnprintf()
    g_strdup_printf() -> ws_strdup_printf()
    g_strdup_vprintf() -> ws_strdup_vprintf()

This is more portable, user-friendly and faster on platforms
where GLib does not like the native I/O.

Adjust the format string to use macros from intypes.h.

1 files changed, 5 insertions, 5 deletions

diff --git a/epan/secrets.c b/epan/secrets.c
index 117ceda264..f028a21d67 100644
--- a/epan/secrets.c
+++ b/epan/secrets.c
@@ -261,7 +261,7 @@ pkcs11_load_keys_from_token(const char *token_uri, const char *pin, char **err)
     ret = gnutls_pkcs11_obj_list_import_url4(&list, &nlist, token_uri,
             GNUTLS_PKCS11_OBJ_FLAG_PRIVKEY|GNUTLS_PKCS11_OBJ_FLAG_LOGIN);
     if (ret < 0) {
-        *err = g_strdup_printf("Failed to iterate through objects for %s: %s", token_uri, gnutls_strerror(ret));
+        *err = ws_strdup_printf("Failed to iterate through objects for %s: %s", token_uri, gnutls_strerror(ret));
         goto cleanup;
     }
 
@@ -443,7 +443,7 @@ load_rsa_keyfile(const char *filename, const char *password, gboolean save_key,
 
     FILE *fp = ws_fopen(filename, "rb");
     if (!fp) {
-        *err = g_strdup_printf("Error loading RSA key file %s: %s", filename, g_strerror(errno));
+        *err = ws_strdup_printf("Error loading RSA key file %s: %s", filename, g_strerror(errno));
         return;
     }
 
@@ -455,7 +455,7 @@ load_rsa_keyfile(const char *filename, const char *password, gboolean save_key,
     }
     fclose(fp);
     if (!x509_priv_key) {
-        *err = g_strdup_printf("Error loading RSA key file %s: %s", filename, errmsg);
+        *err = ws_strdup_printf("Error loading RSA key file %s: %s", filename, errmsg);
         g_free(errmsg);
         return;
     }
@@ -464,12 +464,12 @@ load_rsa_keyfile(const char *filename, const char *password, gboolean save_key,
     ret = gnutls_privkey_import_x509(privkey, x509_priv_key,
             GNUTLS_PRIVKEY_IMPORT_AUTO_RELEASE|GNUTLS_PRIVKEY_IMPORT_COPY);
     if (ret < 0) {
-        *err = g_strdup_printf("Error importing private key %s: %s", filename, gnutls_strerror(ret));
+        *err = ws_strdup_printf("Error importing private key %s: %s", filename, gnutls_strerror(ret));
         goto end;
     }
     ret = gnutls_x509_privkey_get_key_id(x509_priv_key, GNUTLS_KEYID_USE_SHA1, key_id.key_id, &size);
     if (ret < 0 || size != sizeof(key_id)) {
-        *err = g_strdup_printf("Error calculating Key ID for %s: %s", filename, gnutls_strerror(ret));
+        *err = ws_strdup_printf("Error calculating Key ID for %s: %s", filename, gnutls_strerror(ret));
         goto end;
     }