diff options
| author | João Valverde <j@v6e.pt> | 2021-12-19 23:12:36 +0000 |
|---|---|---|
| committer | Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2021-12-19 23:49:55 +0000 |
| commit | ce1dc88173b133c560d741a16d1b493e17f71405 (patch) | |
| tree | fce99cc3750790bad30108946c783790a02dcfcc | |
| parent | dec5590b5b4b4226a48162ac771907693e3130d5 (diff) | |
Fix stdio.h conversions to use the scanf macros
| -rw-r--r-- | dumpcap.c | 2 | ||||
| -rw-r--r-- | epan/protobuf_lang_tree.c | 4 | ||||
| -rw-r--r-- | epan/wslua/wslua_int64.c | 4 | ||||
| -rw-r--r-- | wiretap/daintree-sna.c | 2 |
4 files changed, 6 insertions, 6 deletions
@@ -1650,7 +1650,7 @@ cap_pipe_open_live(char *pipename, } #else /* _WIN32 */ - if (sscanf(pipename, EXTCAP_PIPE_PREFIX "%" PRIuPTR, &extcap_pipe_handle) == 1) + if (sscanf(pipename, EXTCAP_PIPE_PREFIX "%" SCNuPTR, &extcap_pipe_handle) == 1) { /* The client is already connected to extcap pipe. * We have inherited the handle from parent process. diff --git a/epan/protobuf_lang_tree.c b/epan/protobuf_lang_tree.c index c9fd4d6e26..62bc91828e 100644 --- a/epan/protobuf_lang_tree.c +++ b/epan/protobuf_lang_tree.c @@ -895,7 +895,7 @@ pbl_node_t* pbl_create_field_node(pbl_file_descriptor_t* file, int lineno, const case PROTOBUF_TYPE_INT32: case PROTOBUF_TYPE_SINT32: case PROTOBUF_TYPE_SFIXED32: - sscanf(node->orig_default_value, "%" PRId32, &node->default_value.i32); + sscanf(node->orig_default_value, "%" SCNd32, &node->default_value.i32); break; case PROTOBUF_TYPE_INT64: @@ -906,7 +906,7 @@ pbl_node_t* pbl_create_field_node(pbl_file_descriptor_t* file, int lineno, const case PROTOBUF_TYPE_UINT32: case PROTOBUF_TYPE_FIXED32: - sscanf(node->orig_default_value, "%" PRIu32, &node->default_value.u32); + sscanf(node->orig_default_value, "%" SCNu32, &node->default_value.u32); break; case PROTOBUF_TYPE_UINT64: diff --git a/epan/wslua/wslua_int64.c b/epan/wslua/wslua_int64.c index 8d3e9d6481..109133f9c6 100644 --- a/epan/wslua/wslua_int64.c +++ b/epan/wslua/wslua_int64.c @@ -292,7 +292,7 @@ WSLUA_CONSTRUCTOR Int64_fromhex(lua_State* L) { const gchar *s = luaL_checklstring(L,WSLUA_ARG_Int64_fromhex_HEX,&len); if (len > 0) { - if (sscanf(s, "%" PRIx64, &result) != 1) { + if (sscanf(s, "%" SCNx64, &result) != 1) { return luaL_error(L, "Error decoding the passed-in hex string"); } } @@ -852,7 +852,7 @@ WSLUA_CONSTRUCTOR UInt64_fromhex(lua_State* L) { const gchar *s = luaL_checklstring(L,WSLUA_ARG_UInt64_fromhex_HEX,&len); if (len > 0) { - if (sscanf(s, "%" PRIx64, &result) != 1) { + if (sscanf(s, "%" SCNx64, &result) != 1) { return luaL_error(L, "Error decoding the passed-in hex string"); } } diff --git a/wiretap/daintree-sna.c b/wiretap/daintree-sna.c index 08e2bb3234..6c20cb1ca7 100644 --- a/wiretap/daintree-sna.c +++ b/wiretap/daintree-sna.c @@ -174,7 +174,7 @@ daintree_sna_read_packet(FILE_T fh, wtap_rec *rec, Buffer *buf, rec->block = wtap_block_create(WTAP_BLOCK_PACKET); rec->presence_flags = WTAP_HAS_TS|WTAP_HAS_CAP_LEN; - if (sscanf(readLine, "%*s %18" PRIu64 ".%9d %9u %" READDATA_MAX_FIELD_SIZE "s", + if (sscanf(readLine, "%*s %18" SCNu64 ".%9d %9u %" READDATA_MAX_FIELD_SIZE "s", &seconds, &useconds, &rec->rec_header.packet_header.len, readData) != 4) { *err = WTAP_ERR_BAD_FILE; *err_info = g_strdup("daintree_sna: invalid read record"); |