diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2021-02-27 07:17:11 +0000 |
|---|---|---|
| committer | Guy Harris <gharris@sonic.net> | 2021-02-28 22:03:42 +0000 |
| commit | 73d793788ce631ac1c63bf2a0071d3d3e3351213 (patch) | |
| tree | 651f8452d4918e3e0a4bb3858f13a853da4ec9df /sharkd_session.c | |
| parent | 670fab2ce5451c6b73f9bb6fd01fec733b6df3c4 (diff) | |
Remove and replace obsolete ws_snprintf() definition
Since fe94133f0d06935bb5f2afe21f59bbb078d3d9d3 ws_snprintf()
and ws_vsnprintf() don't actually do anything anymore.
The return value of ws_[v]snprintf was discarded before,
now it too conforms to C99.
Diffstat (limited to 'sharkd_session.c')
| -rw-r--r-- | sharkd_session.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sharkd_session.c b/sharkd_session.c index 653bcdf840..d0ec9c79f6 100644 --- a/sharkd_session.c +++ b/sharkd_session.c @@ -20,7 +20,6 @@ #include <glib.h> #include <wsutil/wsjson.h> -#include <wsutil/ws_printf.h> #include <wsutil/json_dumper.h> #include <file.h> @@ -707,7 +706,7 @@ sharkd_session_create_columns(column_info *cinfo, const char *buf, const jsmntok char tok_column_name[64]; char *custom_sepa; - ws_snprintf(tok_column_name, sizeof(tok_column_name), "column%d", i); + snprintf(tok_column_name, sizeof(tok_column_name), "column%d", i); tok_column = json_find_attr(buf, tokens, count, tok_column_name); if (tok_column == NULL) break; @@ -2197,7 +2196,7 @@ sharkd_session_process_tap(char *buf, const jsmntok_t *tokens, int count) const char *tap_filter = ""; GString *tap_error = NULL; - ws_snprintf(tapbuf, sizeof(tapbuf), "tap%d", i); + snprintf(tapbuf, sizeof(tapbuf), "tap%d", i); tok_tap = json_find_attr(buf, tokens, count, tapbuf); if (!tok_tap) break; @@ -3618,7 +3617,7 @@ sharkd_session_process_setconf(char *buf, const jsmntok_t *tokens, int count) if (!tok_name || tok_name[0] == '\0' || !tok_value) return; - ws_snprintf(pref, sizeof(pref), "%s:%s", tok_name, tok_value); + snprintf(pref, sizeof(pref), "%s:%s", tok_name, tok_value); ret = prefs_set_pref(pref, &errmsg); |