osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

wslog: Add macro to validate arguments and return 

Similar to g_return_if_fail(), etc.
This commit is contained in:
João Valverde 2021-08-27 01:03:19 +01:00 committed by Wireshark GitLab Utility
parent 20dc422550
commit bd33320521
2 changed files with 40 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
wsutil/to_str.c
View File

@ -58,10 +58,7 @@ bytes_to_hexstr(char *out, const guint8 *ad, size_t len)
{
size_t i;
if (!ad) {
ws_warning("Null pointer passed to bytes_to_hexstr()");
return NULL;
}
ws_return_ptr_if_null(ad, NULL);
for (i = 0; i < len; i++)
out = byte_to_hex(out, ad[i]);
@ -81,10 +78,7 @@ bytes_to_hexstr_punct(char *out, const guint8 *ad, size_t len, char punct)
{
size_t i;
if (!ad) {
ws_warning("Null pointer passed to bytes_to_hexstr_punct()");
return NULL;
}
ws_return_ptr_if_null(ad, NULL);
out = byte_to_hex(out, ad[0]);
for (i = 1; i < len; i++) {
@ -109,15 +103,8 @@ bytes_to_str_punct_max(wmem_allocator_t *scope, const guint8 *ad, size_t len, co
gchar *buf_ptr;
int truncated = 0;
if (len == 0) {
ws_warning("Zero length passed to bytes_to_str_punct()");
return wmem_strdup(scope, "(zero length)");
}
if (!ad) {
ws_warning("Null pointer passed to bytes_to_str_punct()");
return wmem_strdup(scope, "(null pointer)");
}
ws_return_str_if_zero(scope, len);
ws_return_str_if_null(scope, ad);
if (!punct)
return bytes_to_str_max(scope, ad, len, max);
@ -149,15 +136,8 @@ bytes_to_str_max(wmem_allocator_t *scope, const guint8 *bd, size_t bd_len, size_
gchar *cur_ptr;
int truncated = 0;
if (bd_len == 0) {
ws_warning("Zero length passed to bytes_to_str()");
return wmem_strdup(scope, "(zero length)");
}
if (!bd) {
ws_warning("Null pointer passed to bytes_to_str()");
return wmem_strdup(scope, "(null pointer)");
}
ws_return_str_if_zero(scope, bd_len);
ws_return_str_if_null(scope, bd);
if (max > bd_len * 2)
max = bd_len * 2;

34
wsutil/wslog.h
View File

@ -18,6 +18,8 @@
#include <time.h>
#include <stdarg.h>
#include <wsutil/wmem/wmem.h>
#include <ws_log_defs.h>
#ifdef WS_LOG_DOMAIN
@ -296,6 +298,38 @@ void ws_logv_full(const char *domain, enum ws_log_level level,
#define ws_noisy(...) _LOG_DEBUG(LOG_LEVEL_NOISY, __VA_ARGS__)
#define ws_warn_zero_len() ws_warning("Zero length passed to %s", __func__)
#define ws_warn_null_ptr() ws_warning("Null pointer passed to %s", __func__)
#define ws_return_str_if_zero(scope, len) \
do { \
if (!(len)) { \
ws_warn_zero_len(); \
return wmem_strdup(scope, "(zero length)"); \
} \
} while (0)
#define ws_return_str_if_null(scope, ptr) \
do { \
if (!(ptr)) { \
ws_warn_null_ptr(); \
return wmem_strdup(scope, "(null pointer)"); \
} \
} while (0)
#define ws_return_ptr_if_null(ptr, val) \
do { \
if (!(ptr)) { \
ws_warn_null_ptr(); \
return (val); \
} \
} while (0)
/** Auxiliary function to write custom logging functions.
*
* This function is the same as ws_log_full() but does not perform any