Fix some of the Errors/warnings detected by checkapi

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25274 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/dissectors/packet-ansi_683.c b/epan/dissectors/packet-ansi_683.c
index a75115d1926f4042528671b09bc22044dccf380b..70e8c79244ded244f6028e1df358a6ddbd5afcf5 100644 (file)
--- a/epan/dissectors/packet-ansi_683.c
+++ b/epan/dissectors/packet-ansi_683.c
@@ -1499,7 +1499,7 @@ msg_protocap_rsp(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset)
 
     proto_tree_add_none_format(tree, hf_ansi_683_none,
        tvb, offset, 1,
-       "Mobile station manufacturer\92s model number (%d)",
+       "Mobile station manufacturer's model number (%d)",
        oct);
 
     offset++;

diff --git a/epan/dissectors/packet-ipsec.c b/epan/dissectors/packet-ipsec.c
index 676f2db70e26dbbf33aaf184e4beda6e3f9db086..5a10b2bca89770dc3a8352108319143f74d9e83a 100644 (file)
--- a/epan/dissectors/packet-ipsec.c
+++ b/epan/dissectors/packet-ipsec.c
@@ -2730,8 +2730,8 @@ proto_register_ipsec(void)
        }
 
       PREF_STR_INIT();
-      g_string_sprintf(name_str,"sa_%d", i + 1);
-      g_string_sprintf(title_str,"SA #%d", i + 1);
+      g_string_printf(name_str,"sa_%d", i + 1);
+      g_string_printf(title_str,"SA #%d", i + 1);
 
       prefs_register_string_preference(esp_module, name_str->str, title_str->str,
                        "SA identifier.  Must have the form "
@@ -2745,8 +2745,8 @@ proto_register_ipsec(void)
 
 
       PREF_STR_INIT();
-      g_string_sprintf(name_str, "encryption_algorithm_%d", i + 1);
-      g_string_sprintf(title_str, "Encryption Algorithm #%d", i + 1);
+      g_string_printf(name_str, "encryption_algorithm_%d", i + 1);
+      g_string_printf(title_str, "Encryption Algorithm #%d", i + 1);
 
       prefs_register_enum_preference(esp_module, name_str->str, title_str->str,
                        "Encryption algorithm",
@@ -2754,8 +2754,8 @@ proto_register_ipsec(void)
       PREF_STR_FREE();
 
       PREF_STR_INIT();
-      g_string_sprintf(name_str, "authentication_algorithm_%d", i + 1);
-      g_string_sprintf(title_str, "Authentication Algorithm #%d", i + 1);
+      g_string_printf(name_str, "authentication_algorithm_%d", i + 1);
+      g_string_printf(title_str, "Authentication Algorithm #%d", i + 1);
 
       prefs_register_enum_preference(esp_module, name_str->str, title_str->str,
                        "Authentication algorithm",
@@ -2764,8 +2764,8 @@ proto_register_ipsec(void)
 
 
       PREF_STR_INIT();
-      g_string_sprintf(name_str, "encryption_key_%d", i + 1);
-      g_string_sprintf(title_str, "Encryption Key #%d", i + 1);
+      g_string_printf(name_str, "encryption_key_%d", i + 1);
+      g_string_printf(title_str, "Encryption Key #%d", i + 1);
 
       prefs_register_string_preference(esp_module, name_str->str, title_str->str,
                        "Encryption key. May be ASCII or hexadecimal (if "
@@ -2778,8 +2778,8 @@ proto_register_ipsec(void)
 
 
       PREF_STR_INIT();
-      g_string_sprintf(name_str, "authentication_key_%d", i + 1);
-      g_string_sprintf(title_str, "Authentication Key #%d", i + 1);
+      g_string_printf(name_str, "authentication_key_%d", i + 1);
+      g_string_printf(title_str, "Authentication Key #%d", i + 1);
 
       prefs_register_string_preference(esp_module, name_str->str, title_str->str,
                        "Authentication key. May be ASCII or hexadecimal (if "

diff --git a/epan/dissectors/packet-pkcs12.c b/epan/dissectors/packet-pkcs12.c
index f1edd7aa8dce5d5d642d58a5a5c7ee078e7fe282..174dad2e45ca309f99d39fc469418fa57e3dfaa0 100644 (file)
--- a/epan/dissectors/packet-pkcs12.c
+++ b/epan/dissectors/packet-pkcs12.c
@@ -457,7 +457,7 @@ int PBE_decrypt_data(const char *object_identifier_id _U_, tvbuff_t *encrypted_t
 
        name = g_string_new("");
        oidname = oid_resolved_from_string(object_identifier_id);
-       g_string_sprintf(name, "Decrypted %s", oidname ? oidname : object_identifier_id);
+       g_string_printf(name, "Decrypted %s", oidname ? oidname : object_identifier_id);
 
        /* add it as a new source */
        add_new_data_source(actx->pinfo, clear_tvb, name->str);