diff options
131 files changed, 599 insertions, 599 deletions
diff --git a/capinfos.c b/capinfos.c index 4cfa45510b..c0e0f6c29a 100644 --- a/capinfos.c +++ b/capinfos.c @@ -1820,9 +1820,9 @@ main(int argc, char *argv[]) for (opt = optind; opt < argc; opt++) { - g_strlcpy(file_sha256, "<unknown>", HASH_STR_SIZE); - g_strlcpy(file_rmd160, "<unknown>", HASH_STR_SIZE); - g_strlcpy(file_sha1, "<unknown>", HASH_STR_SIZE); + (void) g_strlcpy(file_sha256, "<unknown>", HASH_STR_SIZE); + (void) g_strlcpy(file_rmd160, "<unknown>", HASH_STR_SIZE); + (void) g_strlcpy(file_sha1, "<unknown>", HASH_STR_SIZE); if (cap_file_hashes) { fh = ws_fopen(argv[opt], "rb"); diff --git a/capture/capture-pcap-util.c b/capture/capture-pcap-util.c index 5f8377a688..3dc6c9d181 100644 --- a/capture/capture-pcap-util.c +++ b/capture/capture-pcap-util.c @@ -292,7 +292,7 @@ if_info_get(const char *name) * Get the description for the interface. */ memset(&ifrdesc, 0, sizeof ifrdesc); - g_strlcpy(ifrdesc.ifr_name, name, sizeof ifrdesc.ifr_name); + (void) g_strlcpy(ifrdesc.ifr_name, name, sizeof ifrdesc.ifr_name); s = socket(AF_INET, SOCK_DGRAM, 0); if (s >= 0) { #ifdef __FreeBSD__ @@ -1138,7 +1138,7 @@ is_linux_bonding_device(const char *ifname) return FALSE; memset(&ifr, 0, sizeof ifr); - g_strlcpy(ifr.ifr_name, ifname, sizeof ifr.ifr_name); + (void) g_strlcpy(ifr.ifr_name, ifname, sizeof ifr.ifr_name); memset(&ifb, 0, sizeof ifb); ifr.ifr_data = (caddr_t)&ifb; #if defined(SIOCBONDINFOQUERY) @@ -1329,7 +1329,7 @@ open_capture_device_pcap_create( */ if (status == PCAP_ERROR) { *open_err = CAP_DEVICE_OPEN_ERR_NOT_PERMISSIONS; - g_strlcpy(*open_err_str, pcap_geterr(pcap_h), + (void) g_strlcpy(*open_err_str, pcap_geterr(pcap_h), sizeof *open_err_str); pcap_close(pcap_h); return NULL; @@ -1353,14 +1353,14 @@ open_capture_device_pcap_create( /* Failed to activate, set to NULL */ if (status == PCAP_ERROR) { *open_err = CAP_DEVICE_OPEN_ERR_GENERIC; - g_strlcpy(*open_err_str, pcap_geterr(pcap_h), + (void) g_strlcpy(*open_err_str, pcap_geterr(pcap_h), sizeof *open_err_str); } else { if (status == PCAP_ERROR_PERM_DENIED) *open_err = CAP_DEVICE_OPEN_ERR_PERMISSIONS; else *open_err = CAP_DEVICE_OPEN_ERR_NOT_PERMISSIONS; - g_strlcpy(*open_err_str, pcap_statustostr(status), + (void) g_strlcpy(*open_err_str, pcap_statustostr(status), sizeof *open_err_str); } pcap_close(pcap_h); @@ -1592,7 +1592,7 @@ open_capture_device(capture_options *capture_opts, * no error message is filled in on a * failure to open an rpcap: URL. */ - g_strlcpy(*open_err_str, + (void) g_strlcpy(*open_err_str, "Unknown error (pcap bug; actual error cause not reported)", sizeof *open_err_str); } diff --git a/capture/ws80211_utils.c b/capture/ws80211_utils.c index 6c34b8e929..ccb690469a 100644 --- a/capture/ws80211_utils.c +++ b/capture/ws80211_utils.c @@ -466,7 +466,7 @@ static int get_freq_wext(const char *ifname) if (fd == -1) return -1; - g_strlcpy(wrq.name1, ifname, IFNAMSIZ); + (void) g_strlcpy(wrq.name1, ifname, IFNAMSIZ); /* SIOCGIWFREQ */ if (ioctl(fd, 0x8B05, &wrq) == 0) { if (wrq.e == 6) @@ -699,7 +699,7 @@ static int ws80211_iface_up(const char *ifname) if (sock == -1) return -1; - g_strlcpy(ifreq.ifr_name, ifname, sizeof(ifreq.ifr_name)); + (void) g_strlcpy(ifreq.ifr_name, ifname, sizeof(ifreq.ifr_name)); if (ioctl(sock, SIOCGIFFLAGS, &ifreq)) goto out_err; @@ -2154,7 +2154,7 @@ main(int argc, char *argv[]) if (err_type < ERR_WT_FMT) { if ((unsigned int)i < caplen - 2) - g_strlcpy((char*) &buf[i], "%s", 2); + (void) g_strlcpy((char*) &buf[i], "%s", 2); err_type = ERR_WT_TOTAL; } else { err_type -= ERR_WT_FMT; diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c index e84850ad47..7a9822ca3e 100644 --- a/epan/addr_resolv.c +++ b/epan/addr_resolv.c @@ -1021,7 +1021,7 @@ static void fill_dummy_ip6(hashipv6_t* volatile tp) { /* Overwrite if we get async DNS reply */ - g_strlcpy(tp->name, tp->ip6, MAXNAMELEN); + (void) g_strlcpy(tp->name, tp->ip6, MAXNAMELEN); } static void @@ -1457,14 +1457,14 @@ parse_ether_line(char *line, ether_t *eth, unsigned int *mask, if ((cp = strtok(NULL, " \t")) == NULL) return -1; - g_strlcpy(eth->name, cp, MAXNAMELEN); + (void) g_strlcpy(eth->name, cp, MAXNAMELEN); if ((cp = strtok(NULL, "\t")) != NULL) { - g_strlcpy(eth->longname, cp, MAXNAMELEN); + (void) g_strlcpy(eth->longname, cp, MAXNAMELEN); } else { /* Make the long name the short name */ - g_strlcpy(eth->longname, eth->name, MAXNAMELEN); + (void) g_strlcpy(eth->longname, eth->name, MAXNAMELEN); } return 0; @@ -1550,13 +1550,13 @@ manuf_hash_new_entry(const guint8 *addr, char* name, char* longname) memcpy(manuf_value->addr, addr, 3); if (name != NULL) { - g_strlcpy(manuf_value->resolved_name, name, MAXNAMELEN); + (void) g_strlcpy(manuf_value->resolved_name, name, MAXNAMELEN); manuf_value->status = HASHETHER_STATUS_RESOLVED_NAME; if (longname != NULL) { - g_strlcpy(manuf_value->resolved_longname, longname, MAXNAMELEN); + (void) g_strlcpy(manuf_value->resolved_longname, longname, MAXNAMELEN); } else { - g_strlcpy(manuf_value->resolved_longname, name, MAXNAMELEN); + (void) g_strlcpy(manuf_value->resolved_longname, name, MAXNAMELEN); } } else { @@ -1774,7 +1774,7 @@ eth_addr_resolve(hashether_t *tp) { const guint8 *addr = tp->addr; if ( (eth = get_ethbyaddr(addr)) != NULL) { - g_strlcpy(tp->resolved_name, eth->name, MAXNAMELEN); + (void) g_strlcpy(tp->resolved_name, eth->name, MAXNAMELEN); tp->status = HASHETHER_STATUS_RESOLVED_NAME; return tp; } else { @@ -1907,7 +1907,7 @@ add_eth_name(const guint8 *addr, const gchar *name) } if (strcmp(tp->resolved_name, name) != 0) { - g_strlcpy(tp->resolved_name, name, MAXNAMELEN); + (void) g_strlcpy(tp->resolved_name, name, MAXNAMELEN); tp->status = HASHETHER_STATUS_RESOLVED_NAME; new_resolved_objects = TRUE; } @@ -1981,7 +1981,7 @@ parse_ipxnets_line(char *line, ipxnet_t *ipxnet) ipxnet->addr = (a0 << 24) | (a1 << 16) | (a2 << 8) | a3; } - g_strlcpy(ipxnet->name, cp, MAXNAMELEN); + (void) g_strlcpy(ipxnet->name, cp, MAXNAMELEN); return 0; @@ -2111,7 +2111,7 @@ ipxnet_name_lookup(wmem_allocator_t *allocator, const guint addr) g_snprintf(tp->name, MAXNAMELEN, "%X", addr); } else { - g_strlcpy(tp->name, ipxnet->name, MAXNAMELEN); + (void) g_strlcpy(tp->name, ipxnet->name, MAXNAMELEN); } return wmem_strdup(allocator, tp->name); @@ -2141,7 +2141,7 @@ parse_vlan_line(char *line, vlan_t *vlan) if ((cp = strtok(NULL, "\t\n")) == NULL) return -1; - g_strlcpy(vlan->name, cp, MAXVLANNAMELEN); + (void) g_strlcpy(vlan->name, cp, MAXVLANNAMELEN); return 0; @@ -2255,7 +2255,7 @@ vlan_name_lookup(const guint id) g_snprintf(tp->name, MAXVLANNAMELEN, "<%u>", id); } else { - g_strlcpy(tp->name, vlan->name, MAXVLANNAMELEN); + (void) g_strlcpy(tp->name, vlan->name, MAXVLANNAMELEN); } return tp->name; @@ -2363,7 +2363,7 @@ add_ip_name_from_string (const char *addr, const char *name) if (resolved_entry) { // If we found a previous matching key (IP address), then just update the value (custom hostname); - g_strlcpy(resolved_entry->name, name, MAXNAMELEN); + (void) g_strlcpy(resolved_entry->name, name, MAXNAMELEN); } else { @@ -2372,7 +2372,7 @@ add_ip_name_from_string (const char *addr, const char *name) memcpy(addr_key, &host_addr.ip6_addr, sizeof(ws_in6_addr)); resolved_entry = wmem_new(wmem_epan_scope(), resolved_name_t); - g_strlcpy(resolved_entry->name, name, MAXNAMELEN); + (void) g_strlcpy(resolved_entry->name, name, MAXNAMELEN); wmem_map_insert(manually_resolved_ipv6_list, addr_key, resolved_entry); } @@ -2381,13 +2381,13 @@ add_ip_name_from_string (const char *addr, const char *name) if (resolved_entry) { // If we found a previous matching key (IP address), then just update the value (custom hostname); - g_strlcpy(resolved_entry->name, name, MAXNAMELEN); + (void) g_strlcpy(resolved_entry->name, name, MAXNAMELEN); } else { // Add a new mapping entry, if this IP address isn't already in the list. resolved_entry = wmem_new(wmem_epan_scope(), resolved_name_t); - g_strlcpy(resolved_entry->name, name, MAXNAMELEN); + (void) g_strlcpy(resolved_entry->name, name, MAXNAMELEN); wmem_map_insert(manually_resolved_ipv4_list, GUINT_TO_POINTER(host_addr.ip4_addr), resolved_entry); } @@ -2610,7 +2610,7 @@ subnet_entry_set(guint32 subnet_addr, const guint8 mask_length, const gchar* nam tp->next = NULL; tp->addr = subnet_addr; - g_strlcpy(tp->name, name, MAXNAMELEN); /* This is longer than subnet names can actually be */ + (void) g_strlcpy(tp->name, name, MAXNAMELEN); /* This is longer than subnet names can actually be */ have_subnet_entry = TRUE; } @@ -2686,7 +2686,7 @@ void fill_unresolved_ss7pc(const gchar * pc_addr, const guint8 ni, const guint32 { hashss7pc_t *tp = host_lookup_ss7pc(ni, pc); - g_strlcpy(tp->pc_addr, pc_addr, MAXNAMELEN); + (void) g_strlcpy(tp->pc_addr, pc_addr, MAXNAMELEN); } const gchar * @@ -2725,7 +2725,7 @@ add_ss7pc_name(const guint8 ni, guint32 pc, const gchar *name) } if (g_ascii_strcasecmp(tp->name, name)) { - g_strlcpy(tp->name, name, MAXNAMELEN); + (void) g_strlcpy(tp->name, name, MAXNAMELEN); } } @@ -3032,7 +3032,7 @@ add_ipv4_name(const guint addr, const gchar *name) } if (g_ascii_strcasecmp(tp->name, name)) { - g_strlcpy(tp->name, name, MAXNAMELEN); + (void) g_strlcpy(tp->name, name, MAXNAMELEN); new_resolved_objects = TRUE; } tp->flags |= TRIED_RESOLVE_ADDRESS|NAME_RESOLVED; @@ -3062,7 +3062,7 @@ add_ipv6_name(const ws_in6_addr *addrp, const gchar *name) } if (g_ascii_strcasecmp(tp->name, name)) { - g_strlcpy(tp->name, name, MAXNAMELEN); + (void) g_strlcpy(tp->name, name, MAXNAMELEN); new_resolved_objects = TRUE; } tp->flags |= TRIED_RESOLVE_ADDRESS|NAME_RESOLVED; diff --git a/epan/address_types.c b/epan/address_types.c index 260dc96b51..c58dd9209d 100644 --- a/epan/address_types.c +++ b/epan/address_types.c @@ -390,7 +390,7 @@ static int fcwwn_name_res_len(void) ******************************************************************************/ static int stringz_addr_to_str(const address* addr, gchar *buf, int buf_len) { - g_strlcpy(buf, (const gchar *)addr->data, buf_len); + (void) g_strlcpy(buf, (const gchar *)addr->data, buf_len); return (int)(strlen(buf)+1); } diff --git a/epan/column-utils.c b/epan/column-utils.c index 930c37c89d..385a243913 100644 --- a/epan/column-utils.c +++ b/epan/column-utils.c @@ -304,13 +304,13 @@ col_clear(column_info *cinfo, const gint el) if (col_item->col_data != col_item->col_buf) { \ /* This was set with "col_set_str()"; copy the string they \ set it to into the buffer, so we can append to it. */ \ - g_strlcpy(col_item->col_buf, col_item->col_data, max_len); \ + (void) g_strlcpy(col_item->col_buf, col_item->col_data, max_len); \ col_item->col_data = col_item->col_buf; \ } #define COL_CHECK_REF_TIME(fd, buf) \ if (fd->ref_time) { \ - g_strlcpy(buf, "*REF*", COL_MAX_LEN ); \ + (void) g_strlcpy(buf, "*REF*", COL_MAX_LEN ); \ return; \ } @@ -490,7 +490,7 @@ col_do_append_fstr(column_info *cinfo, const int el, const char *separator, cons * If we have a separator, append it if the column isn't empty. */ if (sep_len != 0 && len != 0) { - g_strlcat(col_item->col_buf, separator, max_len); + (void) g_strlcat(col_item->col_buf, separator, max_len); len += sep_len; } @@ -567,7 +567,7 @@ col_prepend_fstr(column_info *cinfo, const gint el, const gchar *format, ...) /* This was set with "col_set_str()"; which is effectively const */ orig = col_item->col_data; } else { - g_strlcpy(orig_buf, col_item->col_buf, max_len); + (void) g_strlcpy(orig_buf, col_item->col_buf, max_len); orig = orig_buf; } va_start(ap, format); @@ -580,7 +580,7 @@ col_prepend_fstr(column_info *cinfo, const gint el, const gchar *format, ...) if (col_item->col_fence > 0) col_item->col_fence += (int) strlen(col_item->col_buf); - g_strlcat(col_item->col_buf, orig, max_len); + (void) g_strlcat(col_item->col_buf, orig, max_len); col_item->col_data = col_item->col_buf; } } @@ -610,7 +610,7 @@ col_prepend_fence_fstr(column_info *cinfo, const gint el, const gchar *format, . /* This was set with "col_set_str()"; which is effectively const */ orig = col_item->col_data; } else { - g_strlcpy(orig_buf, col_item->col_buf, max_len); + (void) g_strlcpy(orig_buf, col_item->col_buf, max_len); orig = orig_buf; } va_start(ap, format); @@ -626,7 +626,7 @@ col_prepend_fence_fstr(column_info *cinfo, const gint el, const gchar *format, . } else { col_item->col_fence = (int) strlen(col_item->col_buf); } - g_strlcat(col_item->col_buf, orig, max_len); + (void) g_strlcat(col_item->col_buf, orig, max_len); col_item->col_data = col_item->col_buf; } } @@ -664,7 +664,7 @@ col_add_str(column_info *cinfo, const gint el, const gchar* str) */ col_item->col_data = col_item->col_buf; } - g_strlcpy(&col_item->col_buf[col_item->col_fence], str, max_len - col_item->col_fence); + (void) g_strlcpy(&col_item->col_buf[col_item->col_fence], str, max_len - col_item->col_fence); } } } @@ -698,7 +698,7 @@ col_set_str(column_info *cinfo, const gint el, const gchar* str) */ COL_CHECK_APPEND(col_item, max_len); - g_strlcpy(&col_item->col_buf[col_item->col_fence], str, max_len - col_item->col_fence); + (void) g_strlcpy(&col_item->col_buf[col_item->col_fence], str, max_len - col_item->col_fence); } else { /* * There's no fence, so we can just set the column to point @@ -826,10 +826,10 @@ col_do_append_str(column_info *cinfo, const gint el, const gchar* separator, */ if (separator != NULL) { if (len != 0) { - g_strlcat(col_item->col_buf, separator, max_len); + (void) g_strlcat(col_item->col_buf, separator, max_len); } } - g_strlcat(col_item->col_buf, str, max_len); + (void) g_strlcat(col_item->col_buf, str, max_len); } } } @@ -992,7 +992,7 @@ col_set_abs_ymd_time(const frame_data *fd, column_info *cinfo, const int col) { set_abs_ymd_time(fd, cinfo->columns[col].col_buf, col_decimal_point, TRUE); cinfo->col_expr.col_expr[col] = "frame.time"; - g_strlcpy(cinfo->col_expr.col_expr_val[col],cinfo->columns[col].col_buf,COL_MAX_LEN); + (void) g_strlcpy(cinfo->col_expr.col_expr_val[col],cinfo->columns[col].col_buf,COL_MAX_LEN); cinfo->columns[col].col_data = cinfo->columns[col].col_buf; } @@ -1002,7 +1002,7 @@ col_set_utc_ymd_time(const frame_data *fd, column_info *cinfo, const int col) { set_abs_ymd_time(fd, cinfo->columns[col].col_buf, col_decimal_point, FALSE); cinfo->col_expr.col_expr[col] = "frame.time"; - g_strlcpy(cinfo->col_expr.col_expr_val[col],cinfo->columns[col].col_buf,COL_MAX_LEN); + (void) g_strlcpy(cinfo->col_expr.col_expr_val[col],cinfo->columns[col].col_buf,COL_MAX_LEN); cinfo->columns[col].col_data = cinfo->columns[col].col_buf; } @@ -1120,7 +1120,7 @@ col_set_abs_ydoy_time(const frame_data *fd, column_info *cinfo, const int col) { set_abs_ydoy_time(fd, cinfo->columns[col].col_buf, col_decimal_point, TRUE); cinfo->col_expr.col_expr[col] = "frame.time"; - g_strlcpy(cinfo->col_expr.col_expr_val[col],cinfo->columns[col].col_buf,COL_MAX_LEN); + (void) g_strlcpy(cinfo->col_expr.col_expr_val[col],cinfo->columns[col].col_buf,COL_MAX_LEN); cinfo->columns[col].col_data = cinfo->columns[col].col_buf; } @@ -1130,7 +1130,7 @@ col_set_utc_ydoy_time(const frame_data *fd, column_info *cinfo, const int col) { set_abs_ydoy_time(fd, cinfo->columns[col].col_buf, col_decimal_point, FALSE); cinfo->col_expr.col_expr[col] = "frame.time"; - g_strlcpy(cinfo->col_expr.col_expr_val[col],cinfo->columns[col].col_buf,COL_MAX_LEN); + (void) g_strlcpy(cinfo->col_expr.col_expr_val[col],cinfo->columns[col].col_buf,COL_MAX_LEN); cinfo->columns[col].col_data = cinfo->columns[col].col_buf; } @@ -1397,7 +1397,7 @@ col_set_rel_time(const frame_data *fd, column_info *cinfo, const int col) case TS_SECONDS_DEFAULT: set_time_seconds(fd, &del_rel_ts, cinfo->columns[col].col_buf); cinfo->col_expr.col_expr[col] = "frame.time_relative"; - g_strlcpy(cinfo->col_expr.col_expr_val[col],cinfo->columns[col].col_buf,COL_MAX_LEN); + (void) g_strlcpy(cinfo->col_expr.col_expr_val[col],cinfo->columns[col].col_buf,COL_MAX_LEN); break; case TS_SECONDS_HOUR_MIN_SEC: set_time_hour_min_sec(fd, &del_rel_ts, cinfo->columns[col].col_buf, col_decimal_point); @@ -1421,7 +1421,7 @@ col_set_delta_time(const frame_data *fd, column_info *cinfo, const int col) case TS_SECONDS_DEFAULT: set_time_seconds(fd, &del_cap_ts, cinfo->columns[col].col_buf); cinfo->col_expr.col_expr[col] = "frame.time_delta"; - g_strlcpy(cinfo->col_expr.col_expr_val[col],cinfo->columns[col].col_buf,COL_MAX_LEN); + (void) g_strlcpy(cinfo->col_expr.col_expr_val[col],cinfo->columns[col].col_buf,COL_MAX_LEN); break; case TS_SECONDS_HOUR_MIN_SEC: set_time_hour_min_sec(fd, &del_cap_ts, cinfo->columns[col].col_buf, col_decimal_point); @@ -1451,7 +1451,7 @@ col_set_delta_time_dis(const frame_data *fd, column_info *cinfo, const int col) case TS_SECONDS_DEFAULT: set_time_seconds(fd, &del_dis_ts, cinfo->columns[col].col_buf); cinfo->col_expr.col_expr[col] = "frame.time_delta_displayed"; - g_strlcpy(cinfo->col_expr.col_expr_val[col],cinfo->columns[col].col_buf,COL_MAX_LEN); + (void) g_strlcpy(cinfo->col_expr.col_expr_val[col],cinfo->columns[col].col_buf,COL_MAX_LEN); break; case TS_SECONDS_HOUR_MIN_SEC: set_time_hour_min_sec(fd, &del_dis_ts, cinfo->columns[col].col_buf, col_decimal_point); @@ -1567,7 +1567,7 @@ col_set_abs_time(const frame_data *fd, column_info *cinfo, const int col) { set_abs_time(fd, cinfo->columns[col].col_buf, col_decimal_point, TRUE); cinfo->col_expr.col_expr[col] = "frame.time"; - g_strlcpy(cinfo->col_expr.col_expr_val[col],cinfo->columns[col].col_buf,COL_MAX_LEN); + (void) g_strlcpy(cinfo->col_expr.col_expr_val[col],cinfo->columns[col].col_buf,COL_MAX_LEN); cinfo->columns[col].col_data = cinfo->columns[col].col_buf; } @@ -1577,7 +1577,7 @@ col_set_utc_time(const frame_data *fd, column_info *cinfo, const int col) { set_abs_time(fd, cinfo->columns[col].col_buf, col_decimal_point, FALSE); cinfo->col_expr.col_expr[col] = "frame.time"; - g_strlcpy(cinfo->col_expr.col_expr_val[col],cinfo->columns[col].col_buf,COL_MAX_LEN); + (void) g_strlcpy(cinfo->col_expr.col_expr_val[col],cinfo->columns[col].col_buf,COL_MAX_LEN); cinfo->columns[col].col_data = cinfo->columns[col].col_buf; } @@ -1652,7 +1652,7 @@ col_set_epoch_time(const frame_data *fd, column_info *cinfo, const int col) { if (set_epoch_time(fd, cinfo->columns[col].col_buf)) { cinfo->col_expr.col_expr[col] = "frame.time_delta"; - g_strlcpy(cinfo->col_expr.col_expr_val[col],cinfo->columns[col].col_buf,COL_MAX_LEN); + (void) g_strlcpy(cinfo->col_expr.col_expr_val[col],cinfo->columns[col].col_buf,COL_MAX_LEN); } cinfo->columns[col].col_data = cinfo->columns[col].col_buf; } @@ -1922,7 +1922,7 @@ col_set_time(column_info *cinfo, const gint el, const nstime_t *ts, const char * } col_item->col_data = col_item->col_buf; cinfo->col_expr.col_expr[col] = fieldname; - g_strlcpy(cinfo->col_expr.col_expr_val[col],col_item->col_buf,COL_MAX_LEN); + (void) g_strlcpy(cinfo->col_expr.col_expr_val[col],col_item->col_buf,COL_MAX_LEN); } } } @@ -1972,7 +1972,7 @@ col_set_port(packet_info *pinfo, const int col, const gboolean is_res, const gbo switch (pinfo->ptype) { case PT_SCTP: if (is_res) - g_strlcpy(col_item->col_buf, sctp_port_to_display(pinfo->pool, port), COL_MAX_LEN); + (void) g_strlcpy(col_item->col_buf, sctp_port_to_display(pinfo->pool, port), COL_MAX_LEN); else guint32_to_str_buf(port, col_item->col_buf, COL_MAX_LEN); break; @@ -1980,9 +1980,9 @@ col_set_port(packet_info *pinfo, const int col, const gboolean is_res, const gbo case PT_TCP: guint32_to_str_buf(port, pinfo->cinfo->col_expr.col_expr_val[col], COL_MAX_LEN); if (is_res) - g_strlcpy(col_item->col_buf, tcp_port_to_display(pinfo->pool, port), COL_MAX_LEN); + (void) g_strlcpy(col_item->col_buf, tcp_port_to_display(pinfo->pool, port), COL_MAX_LEN); else - g_strlcpy(col_item->col_buf, pinfo->cinfo->col_expr.col_expr_val[col], COL_MAX_LEN); + (void) g_strlcpy(col_item->col_buf, pinfo->cinfo->col_expr.col_expr_val[col], COL_MAX_LEN); if (is_src) pinfo->cinfo->col_expr.col_expr[col] = "tcp.srcport"; else @@ -1992,9 +1992,9 @@ col_set_port(packet_info *pinfo, const int col, const gboolean is_res, const gbo case PT_UDP: guint32_to_str_buf(port, pinfo->cinfo->col_expr.col_expr_val[col], COL_MAX_LEN); if (is_res) - g_strlcpy(col_item->col_buf, udp_port_to_display(pinfo->pool, port), COL_MAX_LEN); + (void) g_strlcpy(col_item->col_buf, udp_port_to_display(pinfo->pool, port), COL_MAX_LEN); else - g_strlcpy(col_item->col_buf, pinfo->cinfo->col_expr.col_expr_val[col], COL_MAX_LEN); + (void) g_strlcpy(col_item->col_buf, pinfo->cinfo->col_expr.col_expr_val[col], COL_MAX_LEN); if (is_src) pinfo->cinfo->col_expr.col_expr[col] = "udp.srcport"; else @@ -2007,13 +2007,13 @@ col_set_port(packet_info *pinfo, const int col, const gboolean is_res, const gbo else pinfo->cinfo->col_expr.col_expr[col] = "ddp.dst_socket"; guint32_to_str_buf(port, pinfo->cinfo->col_expr.col_expr_val[col], COL_MAX_LEN); - g_strlcpy(col_item->col_buf, pinfo->cinfo->col_expr.col_expr_val[col], COL_MAX_LEN); + (void) g_strlcpy(col_item->col_buf, pinfo->cinfo->col_expr.col_expr_val[col], COL_MAX_LEN); break; case PT_IPX: /* XXX - resolve IPX socket numbers */ snprintf(col_item->col_buf, COL_MAX_LEN, "0x%04x", port); - g_strlcpy(pinfo->cinfo->col_expr.col_expr_val[col], col_item->col_buf,COL_MAX_LEN); + (void) g_strlcpy(pinfo->cinfo->col_expr.col_expr_val[col], col_item->col_buf,COL_MAX_LEN); if (is_src) pinfo->cinfo->col_expr.col_expr[col] = "ipx.src.socket"; else @@ -2023,7 +2023,7 @@ col_set_port(packet_info *pinfo, const int col, const gboolean is_res, const gbo case PT_IDP: /* XXX - resolve IDP socket numbers */ snprintf(col_item->col_buf, COL_MAX_LEN, "0x%04x", port); - g_strlcpy(pinfo->cinfo->col_expr.col_expr_val[col], col_item->col_buf,COL_MAX_LEN); + (void) g_strlcpy(pinfo->cinfo->col_expr.col_expr_val[col], col_item->col_buf,COL_MAX_LEN); if (is_src) pinfo->cinfo->col_expr.col_expr[col] = "idp.src.socket"; else @@ -2033,7 +2033,7 @@ col_set_port(packet_info *pinfo, const int col, const gboolean is_res, const gbo case PT_USB: /* XXX - resolve USB endpoint numbers */ snprintf(col_item->col_buf, COL_MAX_LEN, "0x%08x", port); - g_strlcpy(pinfo->cinfo->col_expr.col_expr_val[col], col_item->col_buf,COL_MAX_LEN); + (void) g_strlcpy(pinfo->cinfo->col_expr.col_expr_val[col], col_item->col_buf,COL_MAX_LEN); if (is_src) pinfo->cinfo->col_expr.col_expr[col] = "usb.src.endpoint"; else @@ -2118,7 +2118,7 @@ col_fill_in_frame_data(const frame_data *fd, column_info *cinfo, const gint col, switch (col_item->col_fmt) { case COL_NUMBER: cinfo->col_expr.col_expr[col] = "frame.number"; - g_strlcpy(cinfo->col_expr.col_expr_val[col], col_item->col_buf, COL_MAX_LEN); + (void) g_strlcpy(cinfo->col_expr.col_expr_val[col], col_item->col_buf, COL_MAX_LEN); break; case COL_CLS_TIME: @@ -2136,7 +2136,7 @@ col_fill_in_frame_data(const frame_data *fd, column_info *cinfo, const gint col, case COL_PACKET_LENGTH: cinfo->col_expr.col_expr[col] = "frame.len"; - g_strlcpy(cinfo->col_expr.col_expr_val[col], col_item->col_buf, COL_MAX_LEN); + (void) g_strlcpy(cinfo->col_expr.col_expr_val[col], col_item->col_buf, COL_MAX_LEN); break; case COL_CUMULATIVE_BYTES: diff --git a/epan/dissectors/asn1/ansi_tcap/packet-ansi_tcap-template.c b/epan/dissectors/asn1/ansi_tcap/packet-ansi_tcap-template.c index b9760992df..a221293797 100644 --- a/epan/dissectors/asn1/ansi_tcap/packet-ansi_tcap-template.c +++ b/epan/dissectors/asn1/ansi_tcap/packet-ansi_tcap-template.c @@ -355,7 +355,7 @@ dissect_ansi_tcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, vo */ if ( p_tcap_context && cur_oid && !p_tcap_context->oid_present ) { /* Save the application context and the sub dissector */ - g_strlcpy(p_tcap_context->oid, cur_oid, sizeof(p_tcap_context->oid)); + (void) g_strlcpy(p_tcap_context->oid, cur_oid, sizeof(p_tcap_context->oid)); if ( (subdissector_handle = dissector_get_string_handle(ber_oid_dissector_table, cur_oid)) ) { p_tcap_context->subdissector_handle=subdissector_handle; p_tcap_context->oid_present=TRUE; diff --git a/epan/dissectors/asn1/h225/h225.cnf b/epan/dissectors/asn1/h225/h225.cnf index fcacc8b0da..d02d825178 100644 --- a/epan/dissectors/asn1/h225/h225.cnf +++ b/epan/dissectors/asn1/h225/h225.cnf @@ -306,7 +306,7 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber if (h225_pi != NULL) { char temp[50]; g_snprintf(temp, 50, "%%s %%s", h225_pi->frame_label, codec_str); - g_strlcpy(h225_pi->frame_label, temp, 50); + (void) g_strlcpy(h225_pi->frame_label, temp, 50); h225_pi->is_faststart = TRUE; } contains_faststart = TRUE; @@ -444,7 +444,7 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber if (contains_faststart) { char temp[50]; g_snprintf(temp, 50, "%s OLC (%s)", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>"), h225_pi->frame_label); - g_strlcpy(h225_pi->frame_label, temp, 50); + (void) g_strlcpy(h225_pi->frame_label, temp, 50); } else g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>")); } @@ -501,7 +501,7 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber if (contains_faststart) { char temp[50]; g_snprintf(temp, 50, "%s OLC (%s)", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>"), h225_pi->frame_label); - g_strlcpy(h225_pi->frame_label, temp, 50); + (void) g_strlcpy(h225_pi->frame_label, temp, 50); } else g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>")); } @@ -519,7 +519,7 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber if (contains_faststart) { char temp[50]; g_snprintf(temp, 50, "%s OLC (%s)", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>"), h225_pi->frame_label); - g_strlcpy(h225_pi->frame_label, temp, 50); + (void) g_strlcpy(h225_pi->frame_label, temp, 50); } else g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>")); } @@ -537,7 +537,7 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber if (contains_faststart) { char temp[50]; g_snprintf(temp, 50, "%s OLC (%s)", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>"), h225_pi->frame_label); - g_strlcpy(h225_pi->frame_label, temp, 50); + (void) g_strlcpy(h225_pi->frame_label, temp, 50); } else g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>")); } @@ -568,7 +568,7 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber if (contains_faststart) { char temp[50]; g_snprintf(temp, 50, "%s OLC (%s)", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>"), h225_pi->frame_label); - g_strlcpy(h225_pi->frame_label, temp, 50); + (void) g_strlcpy(h225_pi->frame_label, temp, 50); } else g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>")); } diff --git a/epan/dissectors/asn1/h245/h245.cnf b/epan/dissectors/asn1/h245/h245.cnf index aeaf549697..2cbc58a85b 100644 --- a/epan/dissectors/asn1/h245/h245.cnf +++ b/epan/dissectors/asn1/h245/h245.cnf @@ -176,7 +176,7 @@ Rfc2733Format FECCapability/rfc2733Format FECMode/rfc2733Format h223_lc_params_temp->subdissector = data_handle; if (upcoming_channel && codec_type) { - g_strlcpy(upcoming_channel->data_type_str, codec_type, sizeof(upcoming_channel->data_type_str)); + (void) g_strlcpy(upcoming_channel->data_type_str, codec_type, sizeof(upcoming_channel->data_type_str)); } upcoming_channel = NULL; #.END @@ -197,7 +197,7 @@ Rfc2733Format FECCapability/rfc2733Format FECMode/rfc2733Format %(DEFAULT_BODY)s if (upcoming_channel && codec_type) { - g_strlcpy(upcoming_channel->data_type_str, codec_type, sizeof(upcoming_channel->data_type_str)); + (void) g_strlcpy(upcoming_channel->data_type_str, codec_type, sizeof(upcoming_channel->data_type_str)); } upcoming_channel = NULL; #.END @@ -386,12 +386,12 @@ Rfc2733Format FECCapability/rfc2733Format FECMode/rfc2733Format /* if it is OLC or RM*/ if ((codec_type != NULL) && (( value == RequestMessage_openLogicalChannel) || ( value == RequestMessage_requestMode))) { - g_strlcat(h245_pi->frame_label, " (", 50); - g_strlcat(h245_pi->frame_label, codec_type, 50); - g_strlcat(h245_pi->frame_label, ")", 50); + (void) g_strlcat(h245_pi->frame_label, " (", 50); + (void) g_strlcat(h245_pi->frame_label, codec_type, 50); + (void) g_strlcat(h245_pi->frame_label, ")", 50); } } - g_strlcat(h245_pi->comment, val_to_str(value, h245_RequestMessage_vals, "<unknown>"), 50); + (void) g_strlcat(h245_pi->comment, val_to_str(value, h245_RequestMessage_vals, "<unknown>"), 50); #.END #---------------------------------------------------------------------------------------- #.FN_BODY ResponseMessage VAL_PTR = &value @@ -406,7 +406,7 @@ Rfc2733Format FECCapability/rfc2733Format FECMode/rfc2733Format if ( strlen(h245_pi->frame_label) == 0 ){ g_snprintf(h245_pi->frame_label, 50, "%%s", val_to_str(value, h245_ResponseMessage_short_vals, "UKN")); } - g_strlcat(h245_pi->comment, val_to_str(value, h245_ResponseMessage_vals, "<unknown>"), 50); + (void) g_strlcat(h245_pi->comment, val_to_str(value, h245_ResponseMessage_vals, "<unknown>"), 50); } #.END @@ -423,7 +423,7 @@ Rfc2733Format FECCapability/rfc2733Format FECMode/rfc2733Format if ( strlen(h245_pi->frame_label) == 0 ){ g_snprintf(h245_pi->frame_label, 50, "%%s", val_to_str(value, h245_IndicationMessage_short_vals, "UKN")); } - g_strlcat(h245_pi->comment, val_to_str(value, h245_IndicationMessage_vals, "<unknown>"), 50); + (void) g_strlcat(h245_pi->comment, val_to_str(value, h245_IndicationMessage_vals, "<unknown>"), 50); } @@ -441,7 +441,7 @@ Rfc2733Format FECCapability/rfc2733Format FECMode/rfc2733Format if ( strlen(h245_pi->frame_label) == 0 ){ g_snprintf(h245_pi->frame_label, 50, "%%s", val_to_str(value, h245_CommandMessage_short_vals, "UKN")); } - g_strlcat(h245_pi->comment, val_to_str(value, h245_CommandMessage_vals, "<unknown>"), 50); + (void) g_strlcat(h245_pi->comment, val_to_str(value, h245_CommandMessage_vals, "<unknown>"), 50); } #.END diff --git a/epan/dissectors/asn1/h245/packet-h245-template.c b/epan/dissectors/asn1/h245/packet-h245-template.c index e01a9eeb82..dfe16cc1c0 100644 --- a/epan/dissectors/asn1/h245/packet-h245-template.c +++ b/epan/dissectors/asn1/h245/packet-h245-template.c @@ -447,7 +447,7 @@ dissect_h245_FastStart_OLC(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr h245_pi->msg_type = H245_OpenLogChn; if (codec_str && codec_type){ - g_strlcpy(codec_str, codec_type, 50); + (void) g_strlcpy(codec_str, codec_type, 50); } } diff --git a/epan/dissectors/asn1/h450-ros/h450-ros.cnf b/epan/dissectors/asn1/h450-ros/h450-ros.cnf index a403dea6bc..cbb657769c 100644 --- a/epan/dissectors/asn1/h450-ros/h450-ros.cnf +++ b/epan/dissectors/asn1/h450-ros/h450-ros.cnf @@ -47,16 +47,16 @@ InvokeProblem VAL_PTR = &problem_val ReturnResultProblem VAL_PTR = &problem_val ReturnErrorProblem VAL_PTR = &problem_val #.FN_FTR GeneralProblem - g_strlcpy(problem_str, val_to_str_const(problem_val, VALS(h450_ros_GeneralProblem_vals), ""), 64); + (void) g_strlcpy(problem_str, val_to_str_const(problem_val, VALS(h450_ros_GeneralProblem_vals), ""), 64); problem_str[64-1] = '\0'; #.FN_FTR InvokeProblem - g_strlcpy(problem_str, val_to_str_const(problem_val, VALS(h450_ros_InvokeProblem_vals), ""), 64); + (void) g_strlcpy(problem_str, val_to_str_const(problem_val, VALS(h450_ros_InvokeProblem_vals), ""), 64); problem_str[64-1] = '\0'; #.FN_FTR ReturnResultProblem - g_strlcpy(problem_str, val_to_str_const(problem_val, VALS(h450_ros_ReturnResultProblem_vals), ""), 64); + (void) g_strlcpy(problem_str, val_to_str_const(problem_val, VALS(h450_ros_ReturnResultProblem_vals), ""), 64); problem_str[64-1] = '\0'; #.FN_FTR ReturnErrorProblem - g_strlcpy(problem_str, val_to_str_const(problem_val, VALS(h450_ros_ReturnErrorProblem_vals), ""), 64); + (void) g_strlcpy(problem_str, val_to_str_const(problem_val, VALS(h450_ros_ReturnErrorProblem_vals), ""), 64); problem_str[64-1] = '\0'; #.END diff --git a/epan/dissectors/asn1/ldap/packet-ldap-template.c b/epan/dissectors/asn1/ldap/packet-ldap-template.c index 30739bebfe..d364a8ba81 100644 --- a/epan/dissectors/asn1/ldap/packet-ldap-template.c +++ b/epan/dissectors/asn1/ldap/packet-ldap-template.c @@ -1302,7 +1302,7 @@ int dissect_mscldap_string(tvbuff_t *tvb, int offset, char *str, int max_len, gb /* The name data MUST start at offset 0 of the tvb */ compr_len = get_dns_name(tvb, offset, max_len, 0, &name, &name_len); - g_strlcpy(str, name, max_len); + (void) g_strlcpy(str, name, max_len); return offset + compr_len; } diff --git a/epan/dissectors/asn1/mms/packet-mms-template.c b/epan/dissectors/asn1/mms/packet-mms-template.c index 36b05820d3..54d61d3027 100644 --- a/epan/dissectors/asn1/mms/packet-mms-template.c +++ b/epan/dissectors/asn1/mms/packet-mms-template.c @@ -98,8 +98,8 @@ static void private_data_add_moreCinfo_id(asn1_ctx_t *actx, tvbuff_t *tvb) { mms_private_data_t *private_data = (mms_private_data_t*)mms_get_private_data(actx); - g_strlcat(private_data->moreCinfo, " ", BUFFER_SIZE_MORE); - g_strlcat(private_data->moreCinfo, tvb_get_string_enc(wmem_packet_scope(), + (void) g_strlcat(private_data->moreCinfo, " ", BUFFER_SIZE_MORE); + (void) g_strlcat(private_data->moreCinfo, tvb_get_string_enc(wmem_packet_scope(), tvb, 2, tvb_get_guint8(tvb, 1), ENC_STRING), BUFFER_SIZE_MORE); } diff --git a/epan/dissectors/asn1/q932-ros/q932-ros.cnf b/epan/dissectors/asn1/q932-ros/q932-ros.cnf index bafcbe953e..1bc116928a 100644 --- a/epan/dissectors/asn1/q932-ros/q932-ros.cnf +++ b/epan/dissectors/asn1/q932-ros/q932-ros.cnf @@ -50,13 +50,13 @@ InvokeProblem VAL_PTR = &problem_val ReturnResultProblem VAL_PTR = &problem_val ReturnErrorProblem VAL_PTR = &problem_val #.FN_FTR GeneralProblem - g_strlcpy(problem_str, val_to_str_const(problem_val, VALS(q932_ros_GeneralProblem_vals), ""), 64); + (void) g_strlcpy(problem_str, val_to_str_const(problem_val, VALS(q932_ros_GeneralProblem_vals), ""), 64); #.FN_FTR InvokeProblem - g_strlcpy(problem_str, val_to_str_const(problem_val, VALS(q932_ros_InvokeProblem_vals), ""), 64); + (void) g_strlcpy(problem_str, val_to_str_const(problem_val, VALS(q932_ros_InvokeProblem_vals), ""), 64); #.FN_FTR ReturnResultProblem - g_strlcpy(problem_str, val_to_str_const(problem_val, VALS(q932_ros_ReturnResultProblem_vals), ""), 64); + (void) g_strlcpy(problem_str, val_to_str_const(problem_val, VALS(q932_ros_ReturnResultProblem_vals), ""), 64); #.FN_FTR ReturnErrorProblem - g_strlcpy(problem_str, val_to_str_const(problem_val, VALS(q932_ros_ReturnErrorProblem_vals), ""), 64); + (void) g_strlcpy(problem_str, val_to_str_const(problem_val, VALS(q932_ros_ReturnErrorProblem_vals), ""), 64); #.END #--- INVOKE --- diff --git a/epan/dissectors/asn1/ros/ros-err.cnf b/epan/dissectors/asn1/ros/ros-err.cnf index c75dcc8447..79ea1b4c48 100644 --- a/epan/dissectors/asn1/ros/ros-err.cnf +++ b/epan/dissectors/asn1/ros/ros-err.cnf @@ -33,7 +33,7 @@ if (actx->rose_ctx->fillin_info) col_append_str(actx->pinfo->cinfo, COL_INFO, descr); if (actx->rose_ctx->fillin_ptr) - g_strlcat(actx->rose_ctx->fillin_ptr, descr, actx->rose_ctx->fillin_buf_size); + (void) g_strlcat(actx->rose_ctx->fillin_ptr, descr, actx->rose_ctx->fillin_buf_size); if (!err_next_tvb) { /* empty error */ err_next_tvb = tvb_new_subset_length_caplen(tvb, (actx->encoding==ASN1_ENC_PER)?offset>>3:offset, 0, 0); diff --git a/epan/dissectors/asn1/ros/ros-inv.cnf b/epan/dissectors/asn1/ros/ros-inv.cnf index 8fcea47d7a..e076f13806 100644 --- a/epan/dissectors/asn1/ros/ros-inv.cnf +++ b/epan/dissectors/asn1/ros/ros-inv.cnf @@ -33,7 +33,7 @@ if (actx->rose_ctx->fillin_info) col_append_str(actx->pinfo->cinfo, COL_INFO, descr); if (actx->rose_ctx->fillin_ptr) - g_strlcat(actx->rose_ctx->fillin_ptr, descr, actx->rose_ctx->fillin_buf_size); + (void) g_strlcat(actx->rose_ctx->fillin_ptr, descr, actx->rose_ctx->fillin_buf_size); if (!arg_next_tvb) { /* empty argument */ arg_next_tvb = tvb_new_subset_length_caplen(tvb, (actx->encoding==ASN1_ENC_PER)?offset>>3:offset, 0, 0); diff --git a/epan/dissectors/asn1/ros/ros-rej.cnf b/epan/dissectors/asn1/ros/ros-rej.cnf index 2b991b9d13..cbb3be0995 100644 --- a/epan/dissectors/asn1/ros/ros-rej.cnf +++ b/epan/dissectors/asn1/ros/ros-rej.cnf @@ -14,5 +14,5 @@ if (actx->rose_ctx->fillin_info) col_append_str(actx->pinfo->cinfo, COL_INFO, descr); if (actx->rose_ctx->fillin_ptr) - g_strlcat(actx->rose_ctx->fillin_ptr, descr, actx->rose_ctx->fillin_buf_size); + (void) g_strlcat(actx->rose_ctx->fillin_ptr, descr, actx->rose_ctx->fillin_buf_size); #.END diff --git a/epan/dissectors/asn1/ros/ros-res.cnf b/epan/dissectors/asn1/ros/ros-res.cnf index fa98dd4b87..0294ba87a9 100644 --- a/epan/dissectors/asn1/ros/ros-res.cnf +++ b/epan/dissectors/asn1/ros/ros-res.cnf @@ -34,7 +34,7 @@ if (actx->rose_ctx->fillin_info) col_append_str(actx->pinfo->cinfo, COL_INFO, descr); if (actx->rose_ctx->fillin_ptr) - g_strlcat(actx->rose_ctx->fillin_ptr, descr, actx->rose_ctx->fillin_buf_size); + (void) g_strlcat(actx->rose_ctx->fillin_ptr, descr, actx->rose_ctx->fillin_buf_size); if (actx->rose_ctx->d.code != -1) { if (!res_next_tvb) { /* empty result */ diff --git a/epan/dissectors/asn1/snmp/packet-snmp-template.c b/epan/dissectors/asn1/snmp/packet-snmp-template.c index 503e02e3f9..d95cf00eda 100644 --- a/epan/dissectors/asn1/snmp/packet-snmp-template.c +++ b/epan/dissectors/asn1/snmp/packet-snmp-template.c @@ -781,7 +781,7 @@ dissect_snmp_VarBind(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pi = proto_tree_add_item(pt_varbind,hfid,tvb,value_offset,value_len,ENC_BIG_ENDIAN); expert_add_info_format(actx->pinfo, pi, &ei_snmp_varbind_response, "%s",note); - g_strlcpy (label, note, ITEM_LABEL_LENGTH); + (void) g_strlcpy (label, note, ITEM_LABEL_LENGTH); goto set_label; } diff --git a/epan/dissectors/asn1/t38/packet-t38-template.c b/epan/dissectors/asn1/t38/packet-t38-template.c index 9525ea3f35..586f030d1a 100644 --- a/epan/dissectors/asn1/t38/packet-t38-template.c +++ b/epan/dissectors/asn1/t38/packet-t38-template.c @@ -246,7 +246,7 @@ void t38_add_address(packet_info *pinfo, /* * Update the conversation data. */ - g_strlcpy(p_conversation_data->setup_method, setup_method, MAX_T38_SETUP_METHOD_SIZE); + (void) g_strlcpy(p_conversation_data->setup_method, setup_method, MAX_T38_SETUP_METHOD_SIZE); p_conversation_data->setup_frame_number = setup_frame_number; p_conversation_data->src_t38_info.reass_ID = 0; p_conversation_data->src_t38_info.reass_start_seqnum = -1; @@ -454,7 +454,7 @@ init_t38_info_conv(packet_info *pinfo) if (!p_t38_packet_conv) { /* copy the t38 conversation info to the packet t38 conversation */ p_t38_packet_conv = wmem_new(wmem_file_scope(), t38_conv); - g_strlcpy(p_t38_packet_conv->setup_method, p_t38_conv->setup_method, MAX_T38_SETUP_METHOD_SIZE); + (void) g_strlcpy(p_t38_packet_conv->setup_method, p_t38_conv->setup_method, MAX_T38_SETUP_METHOD_SIZE); p_t38_packet_conv->setup_frame_number = p_t38_conv->setup_frame_number; memcpy(&(p_t38_packet_conv->src_t38_info), &(p_t38_conv->src_t38_info), sizeof(t38_conv_info)); diff --git a/epan/dissectors/asn1/tcap/packet-tcap-template.c b/epan/dissectors/asn1/tcap/packet-tcap-template.c index 6a1ef189e4..7149870f16 100644 --- a/epan/dissectors/asn1/tcap/packet-tcap-template.c +++ b/epan/dissectors/asn1/tcap/packet-tcap-template.c @@ -1892,7 +1892,7 @@ dissect_tcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d */ if ( p_tcap_context && cur_oid && !p_tcap_context->oid_present ) { /* Save the application context and the sub dissector */ - g_strlcpy(p_tcap_context->oid, cur_oid, sizeof(p_tcap_context->oid)); + (void) g_strlcpy(p_tcap_context->oid, cur_oid, sizeof(p_tcap_context->oid)); p_tcap_context->oid_present=TRUE; if ( (subdissector_handle = dissector_get_string_handle(ber_oid_dissector_table, cur_oid)) ) { p_tcap_context->subdissector_handle=subdissector_handle; @@ -2231,7 +2231,7 @@ dissect_tcap_ITU_ComponentPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs /* ACN, changed, Fallback to lower version * and update the subdissector (purely formal) */ - g_strlcpy(p_tcap_context->oid, cur_oid, sizeof(p_tcap_context->oid)); + (void) g_strlcpy(p_tcap_context->oid, cur_oid, sizeof(p_tcap_context->oid)); if ((subdissector_handle = dissector_get_string_handle(ber_oid_dissector_table, cur_oid))) { p_tcap_context->subdissector_handle = subdissector_handle; p_tcap_context->subdissector_present = TRUE; @@ -2239,7 +2239,7 @@ dissect_tcap_ITU_ComponentPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs } } else { /* We do not have the OID in the TCAP context, so store it */ - g_strlcpy(p_tcap_context->oid, cur_oid, sizeof(p_tcap_context->oid)); + (void) g_strlcpy(p_tcap_context->oid, cur_oid, sizeof(p_tcap_context->oid)); p_tcap_context->oid_present = TRUE; /* Try to find a subdissector according to OID */ if ((subdissector_handle diff --git a/epan/dissectors/asn1/x509if/x509if.cnf b/epan/dissectors/asn1/x509if/x509if.cnf index db64da356b..ce9def0e89 100644 --- a/epan/dissectors/asn1/x509if/x509if.cnf +++ b/epan/dissectors/asn1/x509if/x509if.cnf @@ -198,8 +198,8 @@ DistinguishedName B "2.16.840.1.101.2.2.1.188" "id-at-primaryMember" if(!name) name = actx->external.direct_reference; if(last_rdn) { /* append it to the RDN */ - g_strlcat(last_rdn, name, MAX_RDN_STR_LEN); - g_strlcat(last_rdn, "=", MAX_RDN_STR_LEN); + (void) g_strlcat(last_rdn, name, MAX_RDN_STR_LEN); + (void) g_strlcat(last_rdn, "=", MAX_RDN_STR_LEN); /* append it to the tree */ proto_item_append_text(tree, " (%%s=", name); @@ -245,7 +245,7 @@ DistinguishedName B "2.16.840.1.101.2.2.1.188" "id-at-primaryMember" value = tvb_format_text(out_tvb, 0, tvb_reported_length(out_tvb)); if(last_rdn) { - g_strlcat(last_rdn, value, MAX_RDN_STR_LEN); + (void) g_strlcat(last_rdn, value, MAX_RDN_STR_LEN); /* append it to the tree*/ proto_item_append_text(tree, "%%s)", value); @@ -345,9 +345,9 @@ DistinguishedName B "2.16.840.1.101.2.2.1.188" "id-at-primaryMember" if(*last_dn) { temp_dn = (char *)wmem_strdup_printf(wmem_packet_scope(), "%%s,%%s", last_rdn, last_dn); last_dn[0] = '\0'; - g_strlcat(last_dn, temp_dn, MAX_DN_STR_LEN); + (void) g_strlcat(last_dn, temp_dn, MAX_DN_STR_LEN); } else { - g_strlcat(last_dn, last_rdn, MAX_DN_STR_LEN); + (void) g_strlcat(last_dn, last_rdn, MAX_DN_STR_LEN); } } @@ -361,7 +361,7 @@ DistinguishedName B "2.16.840.1.101.2.2.1.188" "id-at-primaryMember" if(last_rdn) /* this is an additional value - delimit */ - g_strlcat(last_rdn, "+", MAX_RDN_STR_LEN); + (void) g_strlcat(last_rdn, "+", MAX_RDN_STR_LEN); } %(DEFAULT_BODY)s diff --git a/epan/dissectors/packet-6lowpan.c b/epan/dissectors/packet-6lowpan.c index f518269d42..489280ae43 100644 --- a/epan/dissectors/packet-6lowpan.c +++ b/epan/dissectors/packet-6lowpan.c @@ -3685,7 +3685,7 @@ prefs_6lowpan_apply(void) for (i = 0; i < LOWPAN_CONTEXT_MAX; i++) { if (!lowpan_context_prefs[i]) continue; - g_strlcpy(prefix_buf, lowpan_context_prefs[i], 48); + (void) g_strlcpy(prefix_buf, lowpan_context_prefs[i], 48); if ((prefix_str = strtok(prefix_buf, "/")) == NULL) continue; if ((prefix_len_str = strtok(NULL, "/")) == NULL) continue; if (sscanf(prefix_len_str, "%u", &prefix_len) != 1) continue; diff --git a/epan/dissectors/packet-9p.c b/epan/dissectors/packet-9p.c index 129cb5126e..cdede400a9 100644 --- a/epan/dissectors/packet-9p.c +++ b/epan/dissectors/packet-9p.c @@ -1108,7 +1108,7 @@ static void conv_set_fid(packet_info *pinfo, guint32 fid, const gchar *path, gsi return; str = (char*)wmem_alloc(wmem_file_scope(), len); - g_strlcpy(str, path, len); + (void) g_strlcpy(str, path, len); conv_set_fid_nocopy(pinfo, fid, str); } @@ -1148,7 +1148,7 @@ static void conv_set_tag(packet_info *pinfo, guint16 tag, enum _9p_msg_t msgtype taginfo->fid = fid; if (fid_path) { taginfo->fid_path = (char*)wmem_alloc(wmem_file_scope(), wmem_strbuf_get_len(fid_path)+1); - g_strlcpy(taginfo->fid_path, wmem_strbuf_get_str(fid_path), wmem_strbuf_get_len(fid_path)+1); + (void) g_strlcpy(taginfo->fid_path, wmem_strbuf_get_str(fid_path), wmem_strbuf_get_len(fid_path)+1); } else { taginfo->fid_path = NULL; } diff --git a/epan/dissectors/packet-afs.c b/epan/dissectors/packet-afs.c index 15e9f573d6..82c1051a2d 100644 --- a/epan/dissectors/packet-afs.c +++ b/epan/dissectors/packet-afs.c @@ -722,13 +722,13 @@ static void OUT_FS_AFSVolSync(ptvcursor_t *cursor) int acllen; \ char tmp[10]; \ tmp[0] = 0; \ - if ( acl & PRSFS_READ ) g_strlcat(tmp, "r", 10); \ - if ( acl & PRSFS_LOOKUP ) g_strlcat(tmp, "l", 10); \ - if ( acl & PRSFS_INSERT ) g_strlcat(tmp, "i", 10); \ - if ( acl & PRSFS_DELETE ) g_strlcat(tmp, "d", 10); \ - if ( acl & PRSFS_WRITE ) g_strlcat(tmp, "w", 10); \ - if ( acl & PRSFS_LOCK ) g_strlcat(tmp, "k", 10); \ - if ( acl & PRSFS_ADMINISTER ) g_strlcat(tmp, "a", 10); \ + if ( acl & PRSFS_READ ) (void) g_strlcat(tmp, "r", 10); \ + if ( acl & PRSFS_LOOKUP ) (void) g_strlcat(tmp, "l", 10); \ + if ( acl & PRSFS_INSERT ) (void) g_strlcat(tmp, "i", 10); \ + if ( acl & PRSFS_DELETE ) (void) g_strlcat(tmp, "d", 10); \ + if ( acl & PRSFS_WRITE ) (void) g_strlcat(tmp, "w", 10); \ + if ( acl & PRSFS_LOCK ) (void) g_strlcat(tmp, "k", 10); \ + if ( acl & PRSFS_ADMINISTER ) (void) g_strlcat(tmp, "a", 10); \ save = tree; \ tree = proto_tree_add_subtree_format(tree, tvb, offset, bytes, \ ett_afs_acl, NULL, "ACL: %s %s%s", \ diff --git a/epan/dissectors/packet-ansi_tcap.c b/epan/dissectors/packet-ansi_tcap.c index cb9331cbbe..a246c1a9cf 100644 --- a/epan/dissectors/packet-ansi_tcap.c +++ b/epan/dissectors/packet-ansi_tcap.c @@ -1416,7 +1416,7 @@ dissect_ansi_tcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, vo */ if ( p_tcap_context && cur_oid && !p_tcap_context->oid_present ) { /* Save the application context and the sub dissector */ - g_strlcpy(p_tcap_context->oid, cur_oid, sizeof(p_tcap_context->oid)); + (void) g_strlcpy(p_tcap_context->oid, cur_oid, sizeof(p_tcap_context->oid)); if ( (subdissector_handle = dissector_get_string_handle(ber_oid_dissector_table, cur_oid)) ) { p_tcap_context->subdissector_handle=subdissector_handle; p_tcap_context->oid_present=TRUE; diff --git a/epan/dissectors/packet-at.c b/epan/dissectors/packet-at.c index bee390a9b6..cff30859ed 100644 --- a/epan/dissectors/packet-at.c +++ b/epan/dissectors/packet-at.c @@ -1874,7 +1874,7 @@ dissect_at_command(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, char *name; name = (char *) wmem_alloc(wmem_packet_scope(), i_char + 2); - g_strlcpy(name, at_command, i_char + 1); + (void) g_strlcpy(name, at_command, i_char + 1); name[i_char + 1] = '\0'; proto_item_append_text(command_item, ": %s (Unknown)", name); proto_item_append_text(pitem, " (Unknown)"); diff --git a/epan/dissectors/packet-bthfp.c b/epan/dissectors/packet-bthfp.c index 6e754ac981..ce93ec01af 100644 --- a/epan/dissectors/packet-bthfp.c +++ b/epan/dissectors/packet-bthfp.c @@ -1920,7 +1920,7 @@ dissect_at_command(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, char *name; name = (char *) wmem_alloc(wmem_packet_scope(), i_char + 2); - g_strlcpy(name, at_command, i_char + 1); + (void) g_strlcpy(name, at_command, i_char + 1); name[i_char + 1] = '\0'; proto_item_append_text(command_item, ": %s (Unknown)", name); proto_item_append_text(pitem, " (Unknown - Non-Standard HFP Command)"); diff --git a/epan/dissectors/packet-bthsp.c b/epan/dissectors/packet-bthsp.c index df9091055c..ba559a6fea 100644 --- a/epan/dissectors/packet-bthsp.c +++ b/epan/dissectors/packet-bthsp.c @@ -395,7 +395,7 @@ dissect_at_command(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, char *name; name = (char *) wmem_alloc(wmem_packet_scope(), i_char + 2); - g_strlcpy(name, at_command, i_char + 1); + (void) g_strlcpy(name, at_command, i_char + 1); name[i_char + 1] = '\0'; proto_item_append_text(command_item, ": %s (Unknown)", name); proto_item_append_text(pitem, " (Unknown - Non-Standard HSP Command)"); diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c index 2d0d2546bc..56c494caf1 100644 --- a/epan/dissectors/packet-catapult-dct2000.c +++ b/epan/dissectors/packet-catapult-dct2000.c @@ -3102,8 +3102,8 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo /* TODO: only look inside if a preference enabled? */ char dotted_protocol_name[128]; /* N.B. avoiding g_snprintf(), which was slow */ - g_strlcpy(dotted_protocol_name, "dct2000.", 128); - g_strlcpy(dotted_protocol_name+8, protocol_name, 128-8); + (void) g_strlcpy(dotted_protocol_name, "dct2000.", 128); + (void) g_strlcpy(dotted_protocol_name+8, protocol_name, 128-8); protocol_handle = find_dissector(dotted_protocol_name); } diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c index 22a4ea3624..9aa02d8da1 100644 --- a/epan/dissectors/packet-cip.c +++ b/epan/dissectors/packet-cip.c @@ -5549,7 +5549,7 @@ int dissect_cip_attribute(packet_info *pinfo, proto_tree *tree, proto_item *item if (date != NULL) strftime(date_str, 20, "%b %d, %Y", date); else - g_strlcpy(date_str, "Not representable", sizeof date_str); + (void) g_strlcpy(date_str, "Not representable", sizeof date_str); proto_tree_add_uint_format_value(tree, *(attr->phf), tvb, offset, 2, temp_data, "%s", date_str); consumed = 2; break; diff --git a/epan/dissectors/packet-clnp.c b/epan/dissectors/packet-clnp.c index 044bd7cdf1..94f246ef9e 100644 --- a/epan/dissectors/packet-clnp.c +++ b/epan/dissectors/packet-clnp.c @@ -274,11 +274,11 @@ dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ "Unknown (0x%02x)"); flag_string[0] = '\0'; if (cnf_type & CNF_SEG_OK) - g_strlcat(flag_string, "S ", 7); + (void) g_strlcat(flag_string, "S ", 7); if (cnf_type & CNF_MORE_SEGS) - g_strlcat(flag_string, "M ", 7); + (void) g_strlcat(flag_string, "M ", 7); if (cnf_type & CNF_ERR_OK) - g_strlcat(flag_string, "E ", 7); + (void) g_strlcat(flag_string, "E ", 7); ti = proto_tree_add_uint_format(clnp_tree, hf_clnp_type, tvb, P_CLNP_TYPE, 1, cnf_type, "PDU Type : 0x%02x (%s%s)", diff --git a/epan/dissectors/packet-corosync-totemnet.c b/epan/dissectors/packet-corosync-totemnet.c index ba400dc0fb..94e09d054e 100644 --- a/epan/dissectors/packet-corosync-totemnet.c +++ b/epan/dissectors/packet-corosync-totemnet.c @@ -279,7 +279,7 @@ dissect_corosynec_totemnet_with_decryption(tvbuff_t *tvb, memset(private_key, 0, sizeof(private_key)); private_key_len = (strlen(key_for_trial)+4) & 0xFC; - g_strlcpy(private_key, key_for_trial, private_key_len); + (void) g_strlcpy(private_key, key_for_trial, private_key_len); /* * Generate MAC, CIPHER, IV keys from private key diff --git a/epan/dissectors/packet-cpfi.c b/epan/dissectors/packet-cpfi.c index bb0a1f0b83..5fd31316da 100644 --- a/epan/dissectors/packet-cpfi.c +++ b/epan/dissectors/packet-cpfi.c @@ -166,7 +166,7 @@ dissect_cpfi_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tda = (word1 & CPFI_DEST_MASK) >> CPFI_DEST_SHIFT; if ( tda >= FIRST_TIO_CARD_ADDRESS ) { - g_strlcpy(src_str, " CPFI", sizeof(src_str)); + (void) g_strlcpy(src_str, " CPFI", sizeof(src_str)); src = 0; /* Make it smallest */ } else @@ -188,7 +188,7 @@ dissect_cpfi_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tda = (word1 & CPFI_SOURCE_MASK) >> CPFI_SOURCE_SHIFT; if ( tda >= FIRST_TIO_CARD_ADDRESS ) { - g_strlcpy(dst_str, " CPFI", sizeof(dst_str)); + (void) g_strlcpy(dst_str, " CPFI", sizeof(dst_str)); dst = 0; /* Make it smallest */ } else diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c index a37c51b69c..5bce0a57a3 100644 --- a/epan/dissectors/packet-dcerpc.c +++ b/epan/dissectors/packet-dcerpc.c @@ -882,7 +882,7 @@ dcerpc_prompt(packet_info *pinfo, gchar* result) dcerpc_get_transport_salt(pinfo)); g_string_append(str, "with:\r\n"); - g_strlcpy(result, str->str, MAX_DECODE_AS_PROMPT_LEN); + (void) g_strlcpy(result, str->str, MAX_DECODE_AS_PROMPT_LEN); g_string_free(str, TRUE); g_string_free(address_str, TRUE); } diff --git a/epan/dissectors/packet-dof.c b/epan/dissectors/packet-dof.c index a23a80c16f..897f67844d 100644 --- a/epan/dissectors/packet-dof.c +++ b/epan/dissectors/packet-dof.c @@ -8179,20 +8179,20 @@ static int dissect_oap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void guint8 no_of_bits = 5; guint8 i; guint8 bit = 3; - g_strlcpy(str, "...", 20); + (void) g_strlcpy(str, "...", 20); /* read the bits for the int */ for (i = 0; i < no_of_bits; i++) { if (bit && (!(bit % 4))) - g_strlcat(str, " ", 20); + (void) g_strlcat(str, " ", 20); bit++; if (opcode & mask) - g_strlcat(str, "1", 20); + (void) g_strlcat(str, "1", 20); else - g_strlcat(str, "0", 20); + (void) g_strlcat(str, "0", 20); mask = mask >> 1; } diff --git a/epan/dissectors/packet-drbd.c b/epan/dissectors/packet-drbd.c index 616698de09..6d9eebe5e2 100644 --- a/epan/dissectors/packet-drbd.c +++ b/epan/dissectors/packet-drbd.c @@ -1056,7 +1056,7 @@ static void decode_payload_twopc_reply(tvbuff_t *tvb, proto_tree *tree) static void format_node_mask(gchar *s, guint64 value) { if (!value) { - g_strlcpy(s, "<none>", ITEM_LABEL_LENGTH); + (void) g_strlcpy(s, "<none>", ITEM_LABEL_LENGTH); return; } diff --git a/epan/dissectors/packet-epl-profile-parser.c b/epan/dissectors/packet-epl-profile-parser.c index f9d0d5b982..1f8e50af6c 100644 --- a/epan/dissectors/packet-epl-profile-parser.c +++ b/epan/dissectors/packet-epl-profile-parser.c @@ -252,7 +252,7 @@ epl_eds_load(struct profile *profile, const char *eds_file) if ((name = g_key_file_get_string(gkf, *group, "ParameterName", NULL))) { gsize count = strcspn(name, "#") + 1; - g_strlcpy( + (void) g_strlcpy( tmpobj.name, name, count > sizeof tmpobj.name ? sizeof tmpobj.name : count @@ -471,7 +471,7 @@ parse_obj_tag(xmlNode *cur, struct od_entry *out, struct profile *profile) { return FALSE; } else if (g_str_equal("name", key)) { - g_strlcpy(out->name, val, sizeof out->name); + (void) g_strlcpy(out->name, val, sizeof out->name); } else if (g_str_equal("objectType", key)) { out->type_class = 0; diff --git a/epan/dissectors/packet-fmp.c b/epan/dissectors/packet-fmp.c index 15a77bac8e..0c4348c412 100644 --- a/epan/dissectors/packet-fmp.c +++ b/epan/dissectors/packet-fmp.c @@ -380,25 +380,25 @@ dissect_fmp_flushCmd(tvbuff_t *tvb, int offset, proto_tree *tree) if (cmd & bitValue) { switch (bitValue) { case FMP_COMMIT_SPECIFIED: - g_strlcat(msg, "COMMIT_SPECIFIED", MAX_MSG_SIZE); + (void) g_strlcat(msg, "COMMIT_SPECIFIED", MAX_MSG_SIZE); break; case FMP_RELEASE_SPECIFIED: - g_strlcat(msg, "RELEASE_SPECIFIED", MAX_MSG_SIZE); + (void) g_strlcat(msg, "RELEASE_SPECIFIED", MAX_MSG_SIZE); break; case FMP_RELEASE_ALL: - g_strlcat(msg, "RELEASE_ALL", MAX_MSG_SIZE); + (void) g_strlcat(msg, "RELEASE_ALL", MAX_MSG_SIZE); break; case FMP_CLOSE_FILE: - g_strlcat(msg, "CLOSE_FILE", MAX_MSG_SIZE); + (void) g_strlcat(msg, "CLOSE_FILE", MAX_MSG_SIZE); break; case FMP_UPDATE_TIME: - g_strlcat(msg, "UPDATE_TIME", MAX_MSG_SIZE); + (void) g_strlcat(msg, "UPDATE_TIME", MAX_MSG_SIZE); break; case FMP_ACCESS_TIME: - g_strlcat(msg, "ACCESS_TIME", MAX_MSG_SIZE); + (void) g_strlcat(msg, "ACCESS_TIME", MAX_MSG_SIZE); break; default: - g_strlcat(msg, "UNKNOWN", MAX_MSG_SIZE); + (void) g_strlcat(msg, "UNKNOWN", MAX_MSG_SIZE); break; } @@ -407,13 +407,13 @@ dissect_fmp_flushCmd(tvbuff_t *tvb, int offset, proto_tree *tree) /* add a "bitwise inclusive OR" symbol between cmds */ if (cmd) { - g_strlcat(msg, " | ", MAX_MSG_SIZE); + (void) g_strlcat(msg, " | ", MAX_MSG_SIZE); } } } if (strlen(msg) == 0) { - g_strlcpy(msg, "No command specified", MAX_MSG_SIZE); + (void) g_strlcpy(msg, "No command specified", MAX_MSG_SIZE); } proto_tree_add_uint_format_value(tree, hf_fmp_cmd, tvb, offset, 4, cmd, "%s", msg); diff --git a/epan/dissectors/packet-geonw.c b/epan/dissectors/packet-geonw.c index f9e6189367..79f2670168 100644 --- a/epan/dissectors/packet-geonw.c +++ b/epan/dissectors/packet-geonw.c @@ -605,7 +605,7 @@ geonw_addr_resolve(hashgeonw_t *tp) { set_address(ð_addr, AT_ETHER, 6, &(addr[2])); ether_to_str(ð_addr, rname, 18); // We could use ether_name_resolution_str: - // g_strlcpy(rname, ether_name_resolution_str(ð_addr), MAXNAMELEN-l1-4); + // (void) g_strlcpy(rname, ether_name_resolution_str(ð_addr), MAXNAMELEN-l1-4); tp->status = 1; diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c index 93d6b1cb58..d47dbed12d 100644 --- a/epan/dissectors/packet-h225.c +++ b/epan/dissectors/packet-h225.c @@ -3252,7 +3252,7 @@ dissect_h225_FastStart_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx if (h225_pi != NULL) { char temp[50]; g_snprintf(temp, 50, "%s %s", h225_pi->frame_label, codec_str); - g_strlcpy(h225_pi->frame_label, temp, 50); + (void) g_strlcpy(h225_pi->frame_label, temp, 50); h225_pi->is_faststart = TRUE; } contains_faststart = TRUE; @@ -4290,7 +4290,7 @@ dissect_h225_Setup_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, if (contains_faststart) { char temp[50]; g_snprintf(temp, 50, "%s OLC (%s)", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>"), h225_pi->frame_label); - g_strlcpy(h225_pi->frame_label, temp, 50); + (void) g_strlcpy(h225_pi->frame_label, temp, 50); } else g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>")); } @@ -4348,7 +4348,7 @@ dissect_h225_CallProceeding_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t * if (contains_faststart) { char temp[50]; g_snprintf(temp, 50, "%s OLC (%s)", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>"), h225_pi->frame_label); - g_strlcpy(h225_pi->frame_label, temp, 50); + (void) g_strlcpy(h225_pi->frame_label, temp, 50); } else g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>")); } @@ -4397,7 +4397,7 @@ dissect_h225_Connect_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U if (contains_faststart) { char temp[50]; g_snprintf(temp, 50, "%s OLC (%s)", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>"), h225_pi->frame_label); - g_strlcpy(h225_pi->frame_label, temp, 50); + (void) g_strlcpy(h225_pi->frame_label, temp, 50); } else g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>")); } @@ -4444,7 +4444,7 @@ dissect_h225_Alerting_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ if (contains_faststart) { char temp[50]; g_snprintf(temp, 50, "%s OLC (%s)", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>"), h225_pi->frame_label); - g_strlcpy(h225_pi->frame_label, temp, 50); + (void) g_strlcpy(h225_pi->frame_label, temp, 50); } else g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>")); } @@ -4804,7 +4804,7 @@ dissect_h225_Progress_UUIE(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ if (contains_faststart) { char temp[50]; g_snprintf(temp, 50, "%s OLC (%s)", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>"), h225_pi->frame_label); - g_strlcpy(h225_pi->frame_label, temp, 50); + (void) g_strlcpy(h225_pi->frame_label, temp, 50); } else g_snprintf(h225_pi->frame_label, 50, "%s", val_to_str(h225_pi->cs_type, T_h323_message_body_vals, "<unknown>")); } diff --git a/epan/dissectors/packet-h245.c b/epan/dissectors/packet-h245.c index 76270d8d00..ca9eff2652 100644 --- a/epan/dissectors/packet-h245.c +++ b/epan/dissectors/packet-h245.c @@ -8458,7 +8458,7 @@ dissect_h245_T_forwardLogicalChannelParameters(tvbuff_t *tvb _U_, int offset _U_ h223_lc_params_temp->subdissector = data_handle; if (upcoming_channel && codec_type) { - g_strlcpy(upcoming_channel->data_type_str, codec_type, sizeof(upcoming_channel->data_type_str)); + (void) g_strlcpy(upcoming_channel->data_type_str, codec_type, sizeof(upcoming_channel->data_type_str)); } upcoming_channel = NULL; @@ -8527,7 +8527,7 @@ dissect_h245_OLC_reverseLogicalChannelParameters(tvbuff_t *tvb _U_, int offset _ if (upcoming_channel && codec_type) { - g_strlcpy(upcoming_channel->data_type_str, codec_type, sizeof(upcoming_channel->data_type_str)); + (void) g_strlcpy(upcoming_channel->data_type_str, codec_type, sizeof(upcoming_channel->data_type_str)); } upcoming_channel = NULL; @@ -10735,12 +10735,12 @@ dissect_h245_RequestMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx /* if it is OLC or RM*/ if ((codec_type != NULL) && (( value == RequestMessage_openLogicalChannel) || ( value == RequestMessage_requestMode))) { - g_strlcat(h245_pi->frame_label, " (", 50); - g_strlcat(h245_pi->frame_label, codec_type, 50); - g_strlcat(h245_pi->frame_label, ")", 50); + (void) g_strlcat(h245_pi->frame_label, " (", 50); + (void) g_strlcat(h245_pi->frame_label, codec_type, 50); + (void) g_strlcat(h245_pi->frame_label, ")", 50); } } - g_strlcat(h245_pi->comment, val_to_str(value, h245_RequestMessage_vals, "<unknown>"), 50); + (void) g_strlcat(h245_pi->comment, val_to_str(value, h245_RequestMessage_vals, "<unknown>"), 50); return offset; @@ -12356,7 +12356,7 @@ dissect_h245_ResponseMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx if ( strlen(h245_pi->frame_label) == 0 ){ g_snprintf(h245_pi->frame_label, 50, "%s", val_to_str(value, h245_ResponseMessage_short_vals, "UKN")); } - g_strlcat(h245_pi->comment, val_to_str(value, h245_ResponseMessage_vals, "<unknown>"), 50); + (void) g_strlcat(h245_pi->comment, val_to_str(value, h245_ResponseMessage_vals, "<unknown>"), 50); } @@ -13388,7 +13388,7 @@ dissect_h245_CommandMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx if ( strlen(h245_pi->frame_label) == 0 ){ g_snprintf(h245_pi->frame_label, 50, "%s", val_to_str(value, h245_CommandMessage_short_vals, "UKN")); } - g_strlcat(h245_pi->comment, val_to_str(value, h245_CommandMessage_vals, "<unknown>"), 50); + (void) g_strlcat(h245_pi->comment, val_to_str(value, h245_CommandMessage_vals, "<unknown>"), 50); } @@ -14449,7 +14449,7 @@ dissect_h245_IndicationMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac if ( strlen(h245_pi->frame_label) == 0 ){ g_snprintf(h245_pi->frame_label, 50, "%s", val_to_str(value, h245_IndicationMessage_short_vals, "UKN")); } - g_strlcat(h245_pi->comment, val_to_str(value, h245_IndicationMessage_vals, "<unknown>"), 50); + (void) g_strlcat(h245_pi->comment, val_to_str(value, h245_IndicationMessage_vals, "<unknown>"), 50); } @@ -14559,7 +14559,7 @@ dissect_h245_FastStart_OLC(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr h245_pi->msg_type = H245_OpenLogChn; if (codec_str && codec_type){ - g_strlcpy(codec_str, codec_type, 50); + (void) g_strlcpy(codec_str, codec_type, 50); } } diff --git a/epan/dissectors/packet-h264.c b/epan/dissectors/packet-h264.c index aa0ab6b575..e46ada9e32 100644 --- a/epan/dissectors/packet-h264.c +++ b/epan/dissectors/packet-h264.c @@ -557,25 +557,25 @@ dissect_h264_exp_golomb_code(proto_tree *tree, int hf_index, tvbuff_t *tvb, gint str[0] = '\0'; for (bit=0; bit<((int)(bit_offset&0x07)); bit++) { if (bit && (!(bit%4))) { - g_strlcat(str, " ", 256); + (void) g_strlcat(str, " ", 256); } - g_strlcat(str,".", 256); + (void) g_strlcat(str,".", 256); } leading_zero_bits = -1; for (b = 0; !b; leading_zero_bits++) { if (bit && (!(bit%4))) { - g_strlcat(str, " ", 256); + (void) g_strlcat(str, " ", 256); } if (bit && (!(bit%8))) { - g_strlcat(str, " ", 256); + (void) g_strlcat(str, " ", 256); } b = tvb_get_bits8(tvb, bit_offset, 1); if (b != 0) { - g_strlcat(str, "1", 256); + (void) g_strlcat(str, "1", 256); } else { - g_strlcat(str, "0", 256); + (void) g_strlcat(str, "0", 256); } bit++; bit_offset++; @@ -586,13 +586,13 @@ dissect_h264_exp_golomb_code(proto_tree *tree, int hf_index, tvbuff_t *tvb, gint *start_bit_offset = bit_offset; for (; bit%8; bit++) { if (bit && (!(bit%4))) { - g_strlcat(str, " ", 256); + (void) g_strlcat(str, " ", 256); } - g_strlcat(str,".", 256); + (void) g_strlcat(str,".", 256); } if (hf_field) { - g_strlcat(str," = ", 256); - g_strlcat(str, hf_field->name, 256); + (void) g_strlcat(str," = ", 256); + (void) g_strlcat(str, hf_field->name, 256); switch (descriptor) { case H264_SE_V: /* if the syntax element is coded as se(v), @@ -689,25 +689,25 @@ dissect_h264_exp_golomb_code(proto_tree *tree, int hf_index, tvbuff_t *tvb, gint /* read the bits for the int */ for (i=0; i<leading_zero_bits; i++) { if (bit && (!(bit%4))) { - g_strlcat(str, " ", 256); + (void) g_strlcat(str, " ", 256); } if (bit && (!(bit%8))) { - g_strlcat(str, " ", 256); + (void) g_strlcat(str, " ", 256); } bit++; tmp = value & mask; if (tmp != 0) { - g_strlcat(str, "1", 256); + (void) g_strlcat(str, "1", 256); } else { - g_strlcat(str, "0", 256); + (void) g_strlcat(str, "0", 256); } mask = mask>>1; } for ( ; bit%8; bit++) { if (bit && (!(bit%4))) { - g_strlcat(str, " ", 256); + (void) g_strlcat(str, " ", 256); } - g_strlcat(str,".", 256); + (void) g_strlcat(str,".", 256); } switch (descriptor) { @@ -730,11 +730,11 @@ dissect_h264_exp_golomb_code(proto_tree *tree, int hf_index, tvbuff_t *tvb, gint } if (hf_field) { - g_strlcat(str," = ", 256); - g_strlcat(str, hf_field->name, 256); + (void) g_strlcat(str," = ", 256); + (void) g_strlcat(str, hf_field->name, 256); switch (descriptor) { case H264_SE_V: - g_strlcat(str,"(se(v))", 256); + (void) g_strlcat(str,"(se(v))", 256); /* if the syntax element is coded as se(v), * the value of the syntax element is derived by invoking the * mapping process for signed Exp-Golomb codes as specified in diff --git a/epan/dissectors/packet-h265.c b/epan/dissectors/packet-h265.c index 178180b2dc..15499083f3 100644 --- a/epan/dissectors/packet-h265.c +++ b/epan/dissectors/packet-h265.c @@ -789,26 +789,26 @@ dissect_h265_exp_golomb_code(proto_tree *tree, int hf_index, tvbuff_t *tvb, gint str[0] = '\0'; for (bit = 0; bit<((int)(bit_offset & 0x07)); bit++) { if (bit && (!(bit % 4))) { - g_strlcat(str, " ", 256); + (void) g_strlcat(str, " ", 256); } - g_strlcat(str, ".", 256); + (void) g_strlcat(str, ".", 256); } leading_zero_bits = -1; for (b = 0; !b; leading_zero_bits++) { if (bit && (!(bit % 4))) { - g_strlcat(str, " ", 256); + (void) g_strlcat(str, " ", 256); } if (bit && (!(bit % 8))) { - g_strlcat(str, " ", 256); + (void) g_strlcat(str, " ", 256); } b = tvb_get_bits8(tvb, bit_offset, 1); if (b != 0) { - g_strlcat(str, "1", 256); + (void) g_strlcat(str, "1", 256); } else { - g_strlcat(str, "0", 256); + (void) g_strlcat(str, "0", 256); } bit++; bit_offset++; @@ -819,13 +819,13 @@ dissect_h265_exp_golomb_code(proto_tree *tree, int hf_index, tvbuff_t *tvb, gint *start_bit_offset = bit_offset; for (; bit % 8; bit++) { if (bit && (!(bit % 4))) { - g_strlcat(str, " ", 256); + (void) g_strlcat(str, " ", 256); } - g_strlcat(str, ".", 256); + (void) g_strlcat(str, ".", 256); } if (hf_field) { - g_strlcat(str, " = ", 256); - g_strlcat(str, hf_field->name, 256); + (void) g_strlcat(str, " = ", 256); + (void) g_strlcat(str, hf_field->name, 256); switch (descriptor) { case H265_SE_V: /* if the syntax element is coded as se(v), @@ -925,26 +925,26 @@ dissect_h265_exp_golomb_code(proto_tree *tree, int hf_index, tvbuff_t *tvb, gint /* read the bits for the int */ for (i = 0; i<leading_zero_bits; i++) { if (bit && (!(bit % 4))) { - g_strlcat(str, " ", 256); + (void) g_strlcat(str, " ", 256); } if (bit && (!(bit % 8))) { - g_strlcat(str, " ", 256); + (void) g_strlcat(str, " ", 256); } bit++; tmp = value & mask; if (tmp != 0) { - g_strlcat(str, "1", 256); + (void) g_strlcat(str, "1", 256); } else { - g_strlcat(str, "0", 256); + (void) g_strlcat(str, "0", 256); } mask = mask >> 1; } for (; bit % 8; bit++) { if (bit && (!(bit % 4))) { - g_strlcat(str, " ", 256); + (void) g_strlcat(str, " ", 256); } - g_strlcat(str, ".", 256); + (void) g_strlcat(str, ".", 256); } switch (descriptor) { @@ -966,11 +966,11 @@ dissect_h265_exp_golomb_code(proto_tree *tree, int hf_index, tvbuff_t *tvb, gint } if (hf_field) { - g_strlcat(str, " = ", 256); - g_strlcat(str, hf_field->name, 256); + (void) g_strlcat(str, " = ", 256); + (void) g_strlcat(str, hf_field->name, 256); switch (descriptor) { case H265_SE_V: - g_strlcat(str, "(se(v))", 256); + (void) g_strlcat(str, "(se(v))", 256); /* if the syntax element is coded as se(v), * the value of the syntax element is derived by invoking the * mapping process for signed Exp-Golomb codes as specified in diff --git a/epan/dissectors/packet-h450-ros.c b/epan/dissectors/packet-h450-ros.c index d658fd30d9..265e88b018 100644 --- a/epan/dissectors/packet-h450-ros.c +++ b/epan/dissectors/packet-h450-ros.c @@ -231,7 +231,7 @@ dissect_h450_ros_Invoke(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, if (actx->rose_ctx->fillin_info) col_append_str(actx->pinfo->cinfo, COL_INFO, descr); if (actx->rose_ctx->fillin_ptr) - g_strlcat(actx->rose_ctx->fillin_ptr, descr, actx->rose_ctx->fillin_buf_size); + (void) g_strlcat(actx->rose_ctx->fillin_ptr, descr, actx->rose_ctx->fillin_buf_size); if (!arg_next_tvb) { /* empty argument */ arg_next_tvb = tvb_new_subset_length_caplen(tvb, (actx->encoding==ASN1_ENC_PER)?offset>>3:offset, 0, 0); @@ -314,7 +314,7 @@ dissect_h450_ros_ReturnResult(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act if (actx->rose_ctx->fillin_info) col_append_str(actx->pinfo->cinfo, COL_INFO, descr); if (actx->rose_ctx->fillin_ptr) - g_strlcat(actx->rose_ctx->fillin_ptr, descr, actx->rose_ctx->fillin_buf_size); + (void) g_strlcat(actx->rose_ctx->fillin_ptr, descr, actx->rose_ctx->fillin_buf_size); if (actx->rose_ctx->d.code != -1) { if (!res_next_tvb) { /* empty result */ @@ -384,7 +384,7 @@ dissect_h450_ros_ReturnError(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx if (actx->rose_ctx->fillin_info) col_append_str(actx->pinfo->cinfo, COL_INFO, descr); if (actx->rose_ctx->fillin_ptr) - g_strlcat(actx->rose_ctx->fillin_ptr, descr, actx->rose_ctx->fillin_buf_size); + (void) g_strlcat(actx->rose_ctx->fillin_ptr, descr, actx->rose_ctx->fillin_buf_size); if (!err_next_tvb) { /* empty error */ err_next_tvb = tvb_new_subset_length_caplen(tvb, (actx->encoding==ASN1_ENC_PER)?offset>>3:offset, 0, 0); @@ -412,7 +412,7 @@ dissect_h450_ros_GeneralProblem(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a offset = dissect_per_integer(tvb, offset, actx, tree, hf_index, &problem_val); #line 50 "./asn1/h450-ros/h450-ros.cnf" - g_strlcpy(problem_str, val_to_str_const(problem_val, VALS(h450_ros_GeneralProblem_vals), ""), 64); + (void) g_strlcpy(problem_str, val_to_str_const(problem_val, VALS(h450_ros_GeneralProblem_vals), ""), 64); problem_str[64-1] = '\0'; return offset; @@ -437,7 +437,7 @@ dissect_h450_ros_InvokeProblem(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac offset = dissect_per_integer(tvb, offset, actx, tree, hf_index, &problem_val); #line 53 "./asn1/h450-ros/h450-ros.cnf" - g_strlcpy(problem_str, val_to_str_const(problem_val, VALS(h450_ros_InvokeProblem_vals), ""), 64); + (void) g_strlcpy(problem_str, val_to_str_const(problem_val, VALS(h450_ros_InvokeProblem_vals), ""), 64); problem_str[64-1] = '\0'; return offset; @@ -457,7 +457,7 @@ dissect_h450_ros_ReturnResultProblem(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx offset = dissect_per_integer(tvb, offset, actx, tree, hf_index, &problem_val); #line 56 "./asn1/h450-ros/h450-ros.cnf" - g_strlcpy(problem_str, val_to_str_const(problem_val, VALS(h450_ros_ReturnResultProblem_vals), ""), 64); + (void) g_strlcpy(problem_str, val_to_str_const(problem_val, VALS(h450_ros_ReturnResultProblem_vals), ""), 64); problem_str[64-1] = '\0'; return offset; @@ -479,7 +479,7 @@ dissect_h450_ros_ReturnErrorProblem(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ offset = dissect_per_integer(tvb, offset, actx, tree, hf_index, &problem_val); #line 59 "./asn1/h450-ros/h450-ros.cnf" - g_strlcpy(problem_str, val_to_str_const(problem_val, VALS(h450_ros_ReturnErrorProblem_vals), ""), 64); + (void) g_strlcpy(problem_str, val_to_str_const(problem_val, VALS(h450_ros_ReturnErrorProblem_vals), ""), 64); problem_str[64-1] = '\0'; return offset; @@ -536,7 +536,7 @@ dissect_h450_ros_Reject(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, if (actx->rose_ctx->fillin_info) col_append_str(actx->pinfo->cinfo, COL_INFO, descr); if (actx->rose_ctx->fillin_ptr) - g_strlcat(actx->rose_ctx->fillin_ptr, descr, actx->rose_ctx->fillin_buf_size); + (void) g_strlcat(actx->rose_ctx->fillin_ptr, descr, actx->rose_ctx->fillin_buf_size); return offset; } diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 96a511fd6c..01c02b097b 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -33615,15 +33615,15 @@ dissect_ieee80211_common(tvbuff_t *tvb, packet_info *pinfo, } if (algorithm == PROTECTION_ALG_WEP) { - g_strlcpy(wlan_stats.protection, "WEP", MAX_PROTECT_LEN); + (void) g_strlcpy(wlan_stats.protection, "WEP", MAX_PROTECT_LEN); } else if (algorithm == PROTECTION_ALG_TKIP) { - g_strlcpy(wlan_stats.protection, "TKIP", MAX_PROTECT_LEN); + (void) g_strlcpy(wlan_stats.protection, "TKIP", MAX_PROTECT_LEN); } else if (algorithm == PROTECTION_ALG_CCMP || algorithm == PROTECTION_ALG_CCMP_256) { - g_strlcpy(wlan_stats.protection, "CCMP", MAX_PROTECT_LEN); + (void) g_strlcpy(wlan_stats.protection, "CCMP", MAX_PROTECT_LEN); } else if (algorithm == PROTECTION_ALG_GCMP || algorithm == PROTECTION_ALG_GCMP_256) { - g_strlcpy(wlan_stats.protection, "GCMP", MAX_PROTECT_LEN); + (void) g_strlcpy(wlan_stats.protection, "GCMP", MAX_PROTECT_LEN); } else { - g_strlcpy(wlan_stats.protection, "Unknown", MAX_PROTECT_LEN); + (void) g_strlcpy(wlan_stats.protection, "Unknown", MAX_PROTECT_LEN); } /* protection header */ @@ -34909,7 +34909,7 @@ set_dot11decrypt_keys(void) /* XXX - This just lops the end if the key off if it's too long. * Should we handle this more gracefully? */ - g_strlcpy(key.UserPwd.Passphrase, dk->key->str, DOT11DECRYPT_WPA_PASSPHRASE_MAX_LEN+1); + (void) g_strlcpy(key.UserPwd.Passphrase, dk->key->str, DOT11DECRYPT_WPA_PASSPHRASE_MAX_LEN+1); key.UserPwd.SsidLen = 0; if ((dk->ssid != NULL) && (dk->ssid->len <= DOT11DECRYPT_WPA_SSID_MAX_LEN)) diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c index 0cd211e831..f87f57691f 100644 --- a/epan/dissectors/packet-ieee802154.c +++ b/epan/dissectors/packet-ieee802154.c @@ -1294,7 +1294,7 @@ static int ieee802_15_4_short_address_to_str(const address* addr, gchar *buf, in if (ieee_802_15_4_short_addr == 0xffff) { - g_strlcpy(buf, "Broadcast", buf_len); + (void) g_strlcpy(buf, "Broadcast", buf_len); return 10; } diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c index 6d54db0c84..d871774afb 100644 --- a/epan/dissectors/packet-ip.c +++ b/epan/dissectors/packet-ip.c @@ -992,13 +992,13 @@ dissect_ipopt_cipso(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * while (cat_str_len < (strlen(cat_str) + 2 + USHRT_MAX_STRLEN)) cat_str_len += cat_str_len; cat_str_new = (char *)wmem_alloc(wmem_packet_scope(), cat_str_len); - g_strlcpy(cat_str_new, cat_str, cat_str_len); + (void) g_strlcpy(cat_str_new, cat_str, cat_str_len); cat_str_new[cat_str_len - 1] = '\0'; cat_str = cat_str_new; } if (cat_str[0] != '\0') - g_strlcat(cat_str, ",", cat_str_len); - g_strlcat(cat_str, cat_str_tmp, cat_str_len); + (void) g_strlcat(cat_str, ",", cat_str_len); + (void) g_strlcat(cat_str, cat_str_tmp, cat_str_len); } bit_spot++; bitmask >>= 1; @@ -1038,8 +1038,8 @@ dissect_ipopt_cipso(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * tvb_get_ntohs(tvb, offset)); offset += 2; if (cat_str[0] != '\0') - g_strlcat(cat_str, ",", USHRT_MAX_STRLEN * 15); - g_strlcat(cat_str, cat_str_tmp, USHRT_MAX_STRLEN * 15); + (void) g_strlcat(cat_str, ",", USHRT_MAX_STRLEN * 15); + (void) g_strlcat(cat_str, cat_str_tmp, USHRT_MAX_STRLEN * 15); } proto_tree_add_string(field_tree, hf_ip_cipso_categories, tvb, offset - taglen + 4, taglen - 4, cat_str); @@ -1082,8 +1082,8 @@ dissect_ipopt_cipso(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * g_snprintf(cat_str_tmp, USHRT_MAX_STRLEN * 2, "%u", cat_high); if (cat_str[0] != '\0') - g_strlcat(cat_str, ",", USHRT_MAX_STRLEN * 16); - g_strlcat(cat_str, cat_str_tmp, USHRT_MAX_STRLEN * 16); + (void) g_strlcat(cat_str, ",", USHRT_MAX_STRLEN * 16); + (void) g_strlcat(cat_str, cat_str_tmp, USHRT_MAX_STRLEN * 16); } proto_tree_add_string(field_tree, hf_ip_cipso_categories, tvb, offset - taglen + 4, taglen - 4, cat_str); diff --git a/epan/dissectors/packet-ipp.c b/epan/dissectors/packet-ipp.c index c3fd923b5f..4fb50bea9b 100644 --- a/epan/dissectors/packet-ipp.c +++ b/epan/dissectors/packet-ipp.c @@ -1460,11 +1460,11 @@ ipp_fmt_collection(tvbuff_t *tvb, int valoffset, char *buffer, int bufsize) *bufptr++ = ','; if ((bufend - bufptr) < value_length) { - g_strlcpy(bufptr, "...", bufend - bufptr + 1); + (void) g_strlcpy(bufptr, "...", bufend - bufptr + 1); overflow = 1; } else { - g_strlcpy(bufptr, tvb_format_text(tvb, valoffset + 1 + 2 + name_length + 2, value_length), bufend - bufptr + 1); + (void) g_strlcpy(bufptr, tvb_format_text(tvb, valoffset + 1 + 2 + name_length + 2, value_length), bufend - bufptr + 1); } bufptr += strlen(bufptr); @@ -1478,11 +1478,11 @@ ipp_fmt_collection(tvbuff_t *tvb, int valoffset, char *buffer, int bufsize) valoffset = ipp_fmt_collection(tvb, valoffset, temp, sizeof(temp)); if (!overflow) { if ((bufend - bufptr) < (int)strlen(temp)) { - g_strlcpy(bufptr, "...", bufend - bufptr + 1); + (void) g_strlcpy(bufptr, "...", bufend - bufptr + 1); overflow = 1; } else { - g_strlcpy(bufptr, temp, bufend - bufptr + 1); + (void) g_strlcpy(bufptr, temp, bufend - bufptr + 1); } bufptr += strlen(bufptr); } diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c index 0e774275db..79fe5e0ca7 100644 --- a/epan/dissectors/packet-ldap.c +++ b/epan/dissectors/packet-ldap.c @@ -4212,7 +4212,7 @@ int dissect_mscldap_string(tvbuff_t *tvb, int offset, char *str, int max_len, gb /* The name data MUST start at offset 0 of the tvb */ compr_len = get_dns_name(tvb, offset, max_len, 0, &name, &name_len); - g_strlcpy(str, name, max_len); + (void) g_strlcpy(str, name, max_len); return offset + compr_len; } diff --git a/epan/dissectors/packet-log3gpp.c b/epan/dissectors/packet-log3gpp.c index 79cc9cb2bb..8ef89f330f 100644 --- a/epan/dissectors/packet-log3gpp.c +++ b/epan/dissectors/packet-log3gpp.c @@ -253,7 +253,7 @@ lte_mac_pseudo_hdr(char* option_str, packet_info* pinfo, guint16 length, packet_ } /* Need to copy the string in a local buffer since strtok will modify it */ - g_strlcpy(option, option_str, 30); + (void) g_strlcpy(option, option_str, 30); /* Only need to set info once per session. */ p_mac_lte_info = (struct mac_lte_info*)p_get_proto_data(wmem_file_scope(), pinfo, proto_mac_lte, 0); @@ -368,7 +368,7 @@ lte_rlc_pseudo_hdr(char* option_str, packet_info* pinfo, guint16 length, packet_ { proto_rlc_lte = proto_get_id_by_filter_name("rlc-lte"); } - g_strlcpy(option, option_str, 30); + (void) g_strlcpy(option, option_str, 30); /* Only need to set info once per session. */ p_rlc_lte_info = (struct rlc_lte_info*)p_get_proto_data(wmem_file_scope(), pinfo, proto_rlc_lte, 0); @@ -473,7 +473,7 @@ lte_pdcp_pseudo_hdr(char* option_str, packet_info* pinfo, guint16 length _U_, pa { proto_pdcp_lte = proto_get_id_by_filter_name("pdcp-lte"); } - g_strlcpy(option, option_str, 30); + (void) g_strlcpy(option, option_str, 30); /* Only need to set info once per session. */ p_pdcp_lte_info = (struct pdcp_lte_info*)p_get_proto_data(wmem_file_scope(), pinfo, proto_pdcp_lte, 0); diff --git a/epan/dissectors/packet-megaco.c b/epan/dissectors/packet-megaco.c index d20280b24d..e05c71a30d 100644 --- a/epan/dissectors/packet-megaco.c +++ b/epan/dissectors/packet-megaco.c @@ -3586,7 +3586,7 @@ megaco_fmt_content( gchar *result, guint32 context ) case CHOOSE_CONTEXT: case ALL_CONTEXTS: case NULL_CONTEXT: - g_strlcpy(result, val_to_str_const(context, megaco_context_vals, "Unknown"), ITEM_LABEL_LENGTH); + (void) g_strlcpy(result, val_to_str_const(context, megaco_context_vals, "Unknown"), ITEM_LABEL_LENGTH); break; default: g_snprintf( result, ITEM_LABEL_LENGTH, "%d", context); diff --git a/epan/dissectors/packet-mgcp.c b/epan/dissectors/packet-mgcp.c index f04b0441b1..70aedf0524 100644 --- a/epan/dissectors/packet-mgcp.c +++ b/epan/dissectors/packet-mgcp.c @@ -1165,7 +1165,7 @@ static void dissect_mgcp_firstline(tvbuff_t *tvb, packet_info *pinfo, proto_tree } code = tvb_format_text(tvb, tvb_previous_offset, tokenlen); - g_strlcpy(mi->code, code, 5); + (void) g_strlcpy(mi->code, code, 5); if (is_mgcp_verb(tvb, tvb_previous_offset, tvb_current_len, &verb_description)) { mgcp_type = MGCP_REQUEST; @@ -1311,7 +1311,7 @@ static void dissect_mgcp_firstline(tvbuff_t *tvb, packet_info *pinfo, proto_tree mi->request_available = TRUE; mgcp_call->responded = TRUE; mi->req_num = mgcp_call->req_num; - g_strlcpy(mi->code, mgcp_call->code, 5); + (void) g_strlcpy(mi->code, mgcp_call->code, 5); item = proto_tree_add_uint_format(tree, hf_mgcp_req_frame, tvb, 0, 0, mgcp_call->req_num, "This is a response to a request in frame %u", @@ -1459,7 +1459,7 @@ static void dissect_mgcp_firstline(tvbuff_t *tvb, packet_info *pinfo, proto_tree mgcp_call->transid = mi->transid; mgcp_call->responded = FALSE; mgcp_call->req_time=pinfo->abs_ts; - g_strlcpy(mgcp_call->code, mi->code, 5); + (void) g_strlcpy(mgcp_call->code, mi->code, 5); /* Store it */ wmem_map_insert(mgcp_calls, new_mgcp_call_key, mgcp_call); diff --git a/epan/dissectors/packet-mms.c b/epan/dissectors/packet-mms.c index 04b1597d45..4c7af51c6d 100644 --- a/epan/dissectors/packet-mms.c +++ b/epan/dissectors/packet-mms.c @@ -1015,8 +1015,8 @@ static void private_data_add_moreCinfo_id(asn1_ctx_t *actx, tvbuff_t *tvb) { mms_private_data_t *private_data = (mms_private_data_t*)mms_get_private_data(actx); - g_strlcat(private_data->moreCinfo, " ", BUFFER_SIZE_MORE); - g_strlcat(private_data->moreCinfo, tvb_get_string_enc(wmem_packet_scope(), + (void) g_strlcat(private_data->moreCinfo, " ", BUFFER_SIZE_MORE); + (void) g_strlcat(private_data->moreCinfo, tvb_get_string_enc(wmem_packet_scope(), tvb, 2, tvb_get_guint8(tvb, 1), ENC_STRING), BUFFER_SIZE_MORE); } diff --git a/epan/dissectors/packet-mpls.c b/epan/dissectors/packet-mpls.c index 4ecb10d121..47cb30313a 100644 --- a/epan/dissectors/packet-mpls.c +++ b/epan/dissectors/packet-mpls.c @@ -473,13 +473,13 @@ dissect_mpls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ } if ((label == MPLS_LABEL_GACH) && bos) { - g_strlcpy(PW_ACH, "Generic Associated Channel Header",50); + (void) g_strlcpy(PW_ACH, "Generic Associated Channel Header",50); next_tvb = tvb_new_subset_remaining(tvb, offset); call_dissector(dissector_pw_ach, next_tvb, pinfo, tree ); return tvb_captured_length(tvb); } else - g_strlcpy(PW_ACH, "PW Associated Channel Header",50); + (void) g_strlcpy(PW_ACH, "PW Associated Channel Header",50); if (bos) break; diff --git a/epan/dissectors/packet-msrp.c b/epan/dissectors/packet-msrp.c index c097a04305..8b067ed30f 100644 --- a/epan/dissectors/packet-msrp.c +++ b/epan/dissectors/packet-msrp.c @@ -198,7 +198,7 @@ msrp_add_address( packet_info *pinfo, * Update the conversation data. */ p_conv_data->setup_method_set = TRUE; - g_strlcpy(p_conv_data->setup_method, setup_method, MAX_MSRP_SETUP_METHOD_SIZE); + (void) g_strlcpy(p_conv_data->setup_method, setup_method, MAX_MSRP_SETUP_METHOD_SIZE); p_conv_data->setup_frame_number = setup_frame_number; } diff --git a/epan/dissectors/packet-nbt.c b/epan/dissectors/packet-nbt.c index 176e88170d..4b51144376 100644 --- a/epan/dissectors/packet-nbt.c +++ b/epan/dissectors/packet-nbt.c @@ -654,9 +654,9 @@ dissect_nbns_answer(tvbuff_t *tvb, packet_info *pinfo, int offset, int nbns_data (cur_offset - offset) + data_len, ett_nbns_rr, NULL, "%s: type %s, class %s", name, type_name, class_name); - g_strlcat(name, " (", MAX_NAME_LEN); - g_strlcat(name, netbios_name_type_descr(name_type), MAX_NAME_LEN); - g_strlcat(name, ")", MAX_NAME_LEN); + (void) g_strlcat(name, " (", MAX_NAME_LEN); + (void) g_strlcat(name, netbios_name_type_descr(name_type), MAX_NAME_LEN); + (void) g_strlcat(name, ")", MAX_NAME_LEN); add_rr_to_tree(rr_tree, tvb, offset, name, name_len, type, dns_class, ttl, data_len); } diff --git a/epan/dissectors/packet-ncp-sss.c b/epan/dissectors/packet-ncp-sss.c index 1712fb175b..7dc9966e74 100644 --- a/epan/dissectors/packet-ncp-sss.c +++ b/epan/dissectors/packet-ncp-sss.c @@ -153,103 +153,103 @@ process_flags(proto_tree *sss_tree, tvbuff_t *tvb, guint32 foffset) flags = tvb_get_ntohl(tvb, foffset); for (i = 0 ; i < 256; i++) { if (flags & bvalue) { - g_strlcat(flags_str, sep, 1024); + (void) g_strlcat(flags_str, sep, 1024); switch(bvalue) { case 0x00000001: - g_strlcat(flags_str, "Enhanced Protection", 1024); + (void) g_strlcat(flags_str, "Enhanced Protection", 1024); break; case 0x00000002: - g_strlcat(flags_str, "Create ID", 1024); + (void) g_strlcat(flags_str, "Create ID", 1024); break; case 0x00000004: - g_strlcat(flags_str, "Remove Lock", 1024); + (void) g_strlcat(flags_str, "Remove Lock", 1024); break; case 0x00000008: - g_strlcat(flags_str, "Repair", 1024); + (void) g_strlcat(flags_str, "Repair", 1024); break; case 0x00000010: - g_strlcat(flags_str, "Unicode", 1024); + (void) g_strlcat(flags_str, "Unicode", 1024); break; case 0x00000020: - g_strlcat(flags_str, "EP Master Password Used", 1024); + (void) g_strlcat(flags_str, "EP Master Password Used", 1024); break; case 0x00000040: - g_strlcat(flags_str, "EP Password Used", 1024); + (void) g_strlcat(flags_str, "EP Password Used", 1024); break; case 0x00000080: - g_strlcat(flags_str, "Set Tree Name", 1024); + (void) g_strlcat(flags_str, "Set Tree Name", 1024); break; case 0x00000100: - g_strlcat(flags_str, "Get Context", 1024); + (void) g_strlcat(flags_str, "Get Context", 1024); break; case 0x00000200: - g_strlcat(flags_str, "Destroy Context", 1024); + (void) g_strlcat(flags_str, "Destroy Context", 1024); break; case 0x00000400: - g_strlcat(flags_str, "Not Defined", 1024); + (void) g_strlcat(flags_str, "Not Defined", 1024); break; case 0x00000800: - g_strlcat(flags_str, "Not Defined", 1024); + (void) g_strlcat(flags_str, "Not Defined", 1024); break; case 0x00001000: - g_strlcat(flags_str, "EP Lock", 1024); + (void) g_strlcat(flags_str, "EP Lock", 1024); break; case 0x00002000: - g_strlcat(flags_str, "Not Initialized", 1024); + (void) g_strlcat(flags_str, "Not Initialized", 1024); break; case 0x00004000: - g_strlcat(flags_str, "Enhanced Protection", 1024); + (void) g_strlcat(flags_str, "Enhanced Protection", 1024); break; case 0x00008000: - g_strlcat(flags_str, "Store Not Synced", 1024); + (void) g_strlcat(flags_str, "Store Not Synced", 1024); break; case 0x00010000: - g_strlcat(flags_str, "Admin Last Modified", 1024); + (void) g_strlcat(flags_str, "Admin Last Modified", 1024); break; case 0x00020000: - g_strlcat(flags_str, "EP Password Present", 1024); + (void) g_strlcat(flags_str, "EP Password Present", 1024); break; case 0x00040000: - g_strlcat(flags_str, "EP Master Password Present", 1024); + (void) g_strlcat(flags_str, "EP Master Password Present", 1024); break; case 0x00080000: - g_strlcat(flags_str, "MP Disabled", 1024); + (void) g_strlcat(flags_str, "MP Disabled", 1024); break; case 0x00100000: - g_strlcat(flags_str, "Not Defined", 1024); + (void) g_strlcat(flags_str, "Not Defined", 1024); break; case 0x00200000: - g_strlcat(flags_str, "Not Defined", 1024); + (void) g_strlcat(flags_str, "Not Defined", 1024); break; case 0x00400000: - g_strlcat(flags_str, "Not Defined", 1024); + (void) g_strlcat(flags_str, "Not Defined", 1024); break; case 0x00800000: - g_strlcat(flags_str, "Not Defined", 1024); + (void) g_strlcat(flags_str, "Not Defined", 1024); break; case 0x01000000: - g_strlcat(flags_str, "Not Defined", 1024); + (void) g_strlcat(flags_str, "Not Defined", 1024); break; case 0x02000000: - g_strlcat(flags_str, "Not Defined", 1024); + (void) g_strlcat(flags_str, "Not Defined", 1024); break; case 0x04000000: - g_strlcat(flags_str, "Not Defined", 1024); + (void) g_strlcat(flags_str, "Not Defined", 1024); break; case 0x08000000: - g_strlcat(flags_str, "Not Defined", 1024); + (void) g_strlcat(flags_str, "Not Defined", 1024); break; case 0x10000000: - g_strlcat(flags_str, "Not Defined", 1024); + (void) g_strlcat(flags_str, "Not Defined", 1024); break; case 0x20000000: - g_strlcat(flags_str, "Not Defined", 1024); + (void) g_strlcat(flags_str, "Not Defined", 1024); break; case 0x40000000: - g_strlcat(flags_str, "Not Defined", 1024); + (void) g_strlcat(flags_str, "Not Defined", 1024); break; case 0x80000000: - g_strlcat(flags_str, "Not Defined", 1024); + (void) g_strlcat(flags_str, "Not Defined", 1024); break; default: break; diff --git a/epan/dissectors/packet-ncp2222.inc b/epan/dissectors/packet-ncp2222.inc index 85ac889b08..a24570fa62 100644 --- a/epan/dissectors/packet-ncp2222.inc +++ b/epan/dissectors/packet-ncp2222.inc @@ -2117,7 +2117,7 @@ ncp_hash_insert(conversation_t *conversation, guint8 nw_sequence, request_value->req_nds_flags = 0; request_value->nds_request_verb = 0; request_value->nds_version = 0; - g_strlcpy(request_value->object_name, "", 256); + (void) g_strlcpy(request_value->object_name, "", 256); request_value->nds_frag = TRUE; wmem_map_insert(ncp_req_hash, request_key, request_value); @@ -2137,7 +2137,7 @@ ncp_eid_hash_insert(guint32 nw_eid) request_eid_key->nw_eid = nw_eid; request_eid_value = wmem_new0(wmem_file_scope(), ncp_req_eid_hash_value); - g_strlcpy(request_eid_value->object_name, "", 256); + (void) g_strlcpy(request_eid_value->object_name, "", 256); wmem_map_insert(ncp_req_eid_hash, request_eid_key, request_eid_value); @@ -5253,7 +5253,7 @@ process_multivalues(proto_tree *ncp_tree, tvbuff_t *tvb, packet_info *pinfo, nds ioffset = ioffset + 4; ioffset = print_es_type(estree, tvb, values, value3, ioffset); /* values.vstring is being overwritten. So store the resolve name to a global value */ - g_strlcpy(mv_resolve_name_string, values->vstring, 128); + (void) g_strlcpy(mv_resolve_name_string, values->vstring, 128); value4 = tvb_get_letohl(tvb, ioffset); aitem = proto_tree_add_uint_format(ntree, hf_referral_record, tvb, ioffset, 4, value4, "Referral Protocols - %u", value4); @@ -7961,7 +7961,7 @@ dissect_nds_reply(tvbuff_t *tvb, packet_info *pinfo, if (!request_eid_value) { request_eid_value = ncp_eid_hash_insert(global_eid); if (global_object_name != NULL) - g_strlcpy(request_eid_value->object_name, global_object_name, 256); + (void) g_strlcpy(request_eid_value->object_name, global_object_name, 256); else request_eid_value->object_name[0] = '\0'; } @@ -8509,7 +8509,7 @@ dissect_nds_request(tvbuff_t *tvb, packet_info *pinfo, col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s", global_object_name); if (!pinfo->fd->visited) { if (request_value) - g_strlcpy(request_value->object_name, global_object_name, 256); + (void) g_strlcpy(request_value->object_name, global_object_name, 256); } foffset += 4+value1; foffset += align_4(tvb, foffset); @@ -8563,7 +8563,7 @@ dissect_nds_request(tvbuff_t *tvb, packet_info *pinfo, col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s", global_object_name); if (!pinfo->fd->visited) { if (request_value) - g_strlcpy(request_value->object_name, global_object_name, 256); + (void) g_strlcpy(request_value->object_name, global_object_name, 256); } foffset += 4+value1; foffset += align_4(tvb, foffset); @@ -8719,7 +8719,7 @@ dissect_nds_request(tvbuff_t *tvb, packet_info *pinfo, col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s", global_object_name); if (!pinfo->fd->visited) { if (request_value) - g_strlcpy(request_value->object_name, global_object_name, 256); + (void) g_strlcpy(request_value->object_name, global_object_name, 256); } foffset += 4+value1; foffset += align_4(tvb, foffset); @@ -8863,7 +8863,7 @@ dissect_nds_request(tvbuff_t *tvb, packet_info *pinfo, col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s", global_object_name); if (!pinfo->fd->visited) { if (request_value) - g_strlcpy(request_value->object_name, global_object_name, 256); + (void) g_strlcpy(request_value->object_name, global_object_name, 256); } foffset += 4+value1; foffset += align_4(tvb, foffset); @@ -8942,7 +8942,7 @@ dissect_nds_request(tvbuff_t *tvb, packet_info *pinfo, col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s", global_object_name); if (!pinfo->fd->visited) { if (request_value) - g_strlcpy(request_value->object_name, global_object_name, 256); + (void) g_strlcpy(request_value->object_name, global_object_name, 256); } foffset += 4+value1; foffset += align_4(tvb, foffset); @@ -8972,7 +8972,7 @@ dissect_nds_request(tvbuff_t *tvb, packet_info *pinfo, col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s", global_object_name); if (!pinfo->fd->visited) { if (request_value) - g_strlcpy(request_value->object_name, global_object_name, 256); + (void) g_strlcpy(request_value->object_name, global_object_name, 256); } break; case 0x0e: /* Not Defined */ @@ -9018,7 +9018,7 @@ dissect_nds_request(tvbuff_t *tvb, packet_info *pinfo, col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s", global_object_name); if (!pinfo->fd->visited) { if (request_value) - g_strlcpy(request_value->object_name, global_object_name, 256); + (void) g_strlcpy(request_value->object_name, global_object_name, 256); } foffset += 4+value1; foffset += align_4(tvb, foffset); @@ -9044,7 +9044,7 @@ dissect_nds_request(tvbuff_t *tvb, packet_info *pinfo, col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s", global_object_name); if (!pinfo->fd->visited) { if (request_value) - g_strlcpy(request_value->object_name, global_object_name, 256); + (void) g_strlcpy(request_value->object_name, global_object_name, 256); } break; case 0x12: diff --git a/epan/dissectors/packet-netlink-route.c b/epan/dissectors/packet-netlink-route.c index d3d449ffa0..b5d7ad56f4 100644 --- a/epan/dissectors/packet-netlink-route.c +++ b/epan/dissectors/packet-netlink-route.c @@ -340,9 +340,9 @@ _fill_label_value_string_bitmask(char *label, guint32 value, const value_string if (value & vals->value) { value &= ~(vals->value); if (label[0]) - g_strlcat(label, ", ", ITEM_LABEL_LENGTH); + (void) g_strlcat(label, ", ", ITEM_LABEL_LENGTH); - g_strlcat(label, vals->strptr, ITEM_LABEL_LENGTH); + (void) g_strlcat(label, vals->strptr, ITEM_LABEL_LENGTH); } vals++; @@ -350,9 +350,9 @@ _fill_label_value_string_bitmask(char *label, guint32 value, const value_string if (value) { if (label[0]) - g_strlcat(label, ", ", ITEM_LABEL_LENGTH); + (void) g_strlcat(label, ", ", ITEM_LABEL_LENGTH); g_snprintf(tmp, sizeof(tmp), "0x%x", value); - g_strlcat(label, tmp, ITEM_LABEL_LENGTH); + (void) g_strlcat(label, tmp, ITEM_LABEL_LENGTH); } } @@ -412,7 +412,7 @@ hfi_netlink_route_ifi_flags_label(char *label, guint32 value) _fill_label_value_string_bitmask(label, value, iff_vals); g_snprintf(tmp, sizeof(tmp), " (0x%.8x)", value); - g_strlcat(label, tmp, ITEM_LABEL_LENGTH); + (void) g_strlcat(label, tmp, ITEM_LABEL_LENGTH); } static header_field_info hfi_netlink_route_ifi_flags NETLINK_ROUTE_HFI_INIT = @@ -932,7 +932,7 @@ hfi_netlink_route_ifa_flags_label(char *label, guint32 value) _fill_label_value_string_bitmask(label, value, iff_vals); g_snprintf(tmp, sizeof(tmp), " (0x%.8x)", value); - g_strlcat(label, tmp, ITEM_LABEL_LENGTH); + (void) g_strlcat(label, tmp, ITEM_LABEL_LENGTH); } static header_field_info hfi_netlink_route_ifa_flags NETLINK_ROUTE_HFI_INIT = @@ -1270,7 +1270,7 @@ hfi_netlink_route_nd_states_label(char *label, guint32 value) _fill_label_value_string_bitmask(label, value, flags_vals); g_snprintf(tmp, sizeof(tmp), " (0x%.4x)", value); - g_strlcat(label, tmp, ITEM_LABEL_LENGTH); + (void) g_strlcat(label, tmp, ITEM_LABEL_LENGTH); } static header_field_info hfi_netlink_route_nd_state NETLINK_ROUTE_HFI_INIT = diff --git a/epan/dissectors/packet-q932-ros.c b/epan/dissectors/packet-q932-ros.c index c7c62cf8eb..9595ca240b 100644 --- a/epan/dissectors/packet-q932-ros.c +++ b/epan/dissectors/packet-q932-ros.c @@ -292,7 +292,7 @@ dissect_q932_ros_Invoke(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset if (actx->rose_ctx->fillin_info) col_append_str(actx->pinfo->cinfo, COL_INFO, descr); if (actx->rose_ctx->fillin_ptr) - g_strlcat(actx->rose_ctx->fillin_ptr, descr, actx->rose_ctx->fillin_buf_size); + (void) g_strlcat(actx->rose_ctx->fillin_ptr, descr, actx->rose_ctx->fillin_buf_size); if (!arg_next_tvb) { /* empty argument */ arg_next_tvb = tvb_new_subset_length_caplen(tvb, (actx->encoding==ASN1_ENC_PER)?offset>>3:offset, 0, 0); @@ -385,7 +385,7 @@ dissect_q932_ros_ReturnResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int if (actx->rose_ctx->fillin_info) col_append_str(actx->pinfo->cinfo, COL_INFO, descr); if (actx->rose_ctx->fillin_ptr) - g_strlcat(actx->rose_ctx->fillin_ptr, descr, actx->rose_ctx->fillin_buf_size); + (void) g_strlcat(actx->rose_ctx->fillin_ptr, descr, actx->rose_ctx->fillin_buf_size); if (actx->rose_ctx->d.code != -1) { if (!res_next_tvb) { /* empty result */ @@ -465,7 +465,7 @@ dissect_q932_ros_ReturnError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o if (actx->rose_ctx->fillin_info) col_append_str(actx->pinfo->cinfo, COL_INFO, descr); if (actx->rose_ctx->fillin_ptr) - g_strlcat(actx->rose_ctx->fillin_ptr, descr, actx->rose_ctx->fillin_buf_size); + (void) g_strlcat(actx->rose_ctx->fillin_ptr, descr, actx->rose_ctx->fillin_buf_size); if (!err_next_tvb) { /* empty error */ err_next_tvb = tvb_new_subset_length_caplen(tvb, (actx->encoding==ASN1_ENC_PER)?offset>>3:offset, 0, 0); @@ -494,7 +494,7 @@ dissect_q932_ros_GeneralProblem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in &problem_val); #line 53 "./asn1/q932-ros/q932-ros.cnf" - g_strlcpy(problem_str, val_to_str_const(problem_val, VALS(q932_ros_GeneralProblem_vals), ""), 64); + (void) g_strlcpy(problem_str, val_to_str_const(problem_val, VALS(q932_ros_GeneralProblem_vals), ""), 64); return offset; } @@ -519,7 +519,7 @@ dissect_q932_ros_InvokeProblem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int &problem_val); #line 55 "./asn1/q932-ros/q932-ros.cnf" - g_strlcpy(problem_str, val_to_str_const(problem_val, VALS(q932_ros_InvokeProblem_vals), ""), 64); + (void) g_strlcpy(problem_str, val_to_str_const(problem_val, VALS(q932_ros_InvokeProblem_vals), ""), 64); return offset; } @@ -539,7 +539,7 @@ dissect_q932_ros_ReturnResultProblem(gboolean implicit_tag _U_, tvbuff_t *tvb _U &problem_val); #line 57 "./asn1/q932-ros/q932-ros.cnf" - g_strlcpy(problem_str, val_to_str_const(problem_val, VALS(q932_ros_ReturnResultProblem_vals), ""), 64); + (void) g_strlcpy(problem_str, val_to_str_const(problem_val, VALS(q932_ros_ReturnResultProblem_vals), ""), 64); return offset; } @@ -561,7 +561,7 @@ dissect_q932_ros_ReturnErrorProblem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ &problem_val); #line 59 "./asn1/q932-ros/q932-ros.cnf" - g_strlcpy(problem_str, val_to_str_const(problem_val, VALS(q932_ros_ReturnErrorProblem_vals), ""), 64); + (void) g_strlcpy(problem_str, val_to_str_const(problem_val, VALS(q932_ros_ReturnErrorProblem_vals), ""), 64); return offset; } @@ -617,7 +617,7 @@ dissect_q932_ros_Reject(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset if (actx->rose_ctx->fillin_info) col_append_str(actx->pinfo->cinfo, COL_INFO, descr); if (actx->rose_ctx->fillin_ptr) - g_strlcat(actx->rose_ctx->fillin_ptr, descr, actx->rose_ctx->fillin_buf_size); + (void) g_strlcat(actx->rose_ctx->fillin_ptr, descr, actx->rose_ctx->fillin_buf_size); return offset; } diff --git a/epan/dissectors/packet-quakeworld.c b/epan/dissectors/packet-quakeworld.c index 979bfed6be..461b67320f 100644 --- a/epan/dissectors/packet-quakeworld.c +++ b/epan/dissectors/packet-quakeworld.c @@ -478,8 +478,8 @@ dissect_quakeworld_ConnectionlessPacket(tvbuff_t *tvb, packet_info *pinfo, } remaining[0] = '\0'; for (i=2; i<Cmd_Argc() ; i++) { - g_strlcat (remaining, Cmd_Argv(i), MAX_TEXT_SIZE+1); - g_strlcat (remaining, " ", MAX_TEXT_SIZE+1); + (void) g_strlcat (remaining, Cmd_Argv(i), MAX_TEXT_SIZE+1); + (void) g_strlcat (remaining, " ", MAX_TEXT_SIZE+1); } if (text_tree) { proto_tree_add_string(argument_tree, diff --git a/epan/dissectors/packet-rdt.c b/epan/dissectors/packet-rdt.c index 9f88451eec..f4385117c7 100644 --- a/epan/dissectors/packet-rdt.c +++ b/epan/dissectors/packet-rdt.c @@ -258,7 +258,7 @@ void rdt_add_address(packet_info *pinfo, } /* Update the conversation data. */ - g_strlcpy(p_conv_data->method, setup_method, MAX_RDT_SETUP_METHOD_SIZE); + (void) g_strlcpy(p_conv_data->method, setup_method, MAX_RDT_SETUP_METHOD_SIZE); p_conv_data->frame_number = pinfo->num; p_conv_data->feature_level = rdt_feature_level; } @@ -1196,7 +1196,7 @@ static void show_setup_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { /* Save this conversation info into packet info */ p_conv_packet_data = wmem_new(wmem_file_scope(), struct _rdt_conversation_info); - g_strlcpy(p_conv_packet_data->method, p_conv_data->method, MAX_RDT_SETUP_METHOD_SIZE); + (void) g_strlcpy(p_conv_packet_data->method, p_conv_data->method, MAX_RDT_SETUP_METHOD_SIZE); p_conv_packet_data->frame_number = p_conv_data->frame_number; p_conv_packet_data->feature_level = p_conv_data->feature_level; p_add_proto_data(wmem_file_scope(), pinfo, proto_rdt, 0, p_conv_packet_data); diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c index d7994a7887..012f0ef93a 100644 --- a/epan/dissectors/packet-rtcp.c +++ b/epan/dissectors/packet-rtcp.c @@ -935,7 +935,7 @@ void srtcp_add_address( packet_info *pinfo, * Update the conversation data. */ p_conv_data->setup_method_set = TRUE; - g_strlcpy(p_conv_data->setup_method, setup_method, MAX_RTCP_SETUP_METHOD_SIZE); + (void) g_strlcpy(p_conv_data->setup_method, setup_method, MAX_RTCP_SETUP_METHOD_SIZE); p_conv_data->setup_frame_number = setup_frame_number; p_conv_data->srtcp_info = srtcp_info; } diff --git a/epan/dissectors/packet-rtp.c b/epan/dissectors/packet-rtp.c index 996cc1eaa2..db11323657 100644 --- a/epan/dissectors/packet-rtp.c +++ b/epan/dissectors/packet-rtp.c @@ -1014,7 +1014,7 @@ bluetooth_add_address(packet_info *pinfo, address *addr, guint32 stream_number, /* Free the hash if already exists */ rtp_dyn_payload_free(p_conv_data->rtp_dyn_payload); - g_strlcpy(p_conv_data->method, setup_method, MAX_RTP_SETUP_METHOD_SIZE+1); + (void) g_strlcpy(p_conv_data->method, setup_method, MAX_RTP_SETUP_METHOD_SIZE+1); p_conv_data->frame_number = setup_frame_number; p_conv_data->media_types = media_types; p_conv_data->rtp_dyn_payload = NULL; @@ -1153,7 +1153,7 @@ srtp_add_address(packet_info *pinfo, const port_type ptype, address *addr, int p DPRINT(("passed-in rtp_dyn_payload is the same as in the conversation")); } - g_strlcpy(p_conv_data->method, setup_method, MAX_RTP_SETUP_METHOD_SIZE+1); + (void) g_strlcpy(p_conv_data->method, setup_method, MAX_RTP_SETUP_METHOD_SIZE+1); p_conv_data->frame_number = setup_frame_number; p_conv_data->media_types = media_types; p_conv_data->srtp_info = srtp_info; @@ -1249,7 +1249,7 @@ dissect_rtp_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data p_conv_data->rtp_conv_info->multisegment_pdus = wmem_tree_new(wmem_file_scope()); conversation_add_proto_data(p_conv, proto_rtp, p_conv_data); } - g_strlcpy(p_conv_data->method, "HEUR RTP", MAX_RTP_SETUP_METHOD_SIZE+1); + (void) g_strlcpy(p_conv_data->method, "HEUR RTP", MAX_RTP_SETUP_METHOD_SIZE+1); p_conv_data->frame_number = pinfo->num; p_conv_data->media_types = 0; p_conv_data->srtp_info = NULL; @@ -2550,7 +2550,7 @@ get_conv_info(packet_info *pinfo, struct _rtp_info *rtp_info) /* Save this conversation info into packet info */ /* XXX: why is this file pool not pinfo->pool? */ p_conv_packet_data = wmem_new(wmem_file_scope(), struct _rtp_conversation_info); - g_strlcpy(p_conv_packet_data->method, p_conv_data->method, MAX_RTP_SETUP_METHOD_SIZE+1); + (void) g_strlcpy(p_conv_packet_data->method, p_conv_data->method, MAX_RTP_SETUP_METHOD_SIZE+1); p_conv_packet_data->frame_number = p_conv_data->frame_number; p_conv_packet_data->media_types = p_conv_data->media_types; /* do not increment ref count for the rtp_dyn_payload */ diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c index 547fab902d..f1e562c407 100644 --- a/epan/dissectors/packet-rtps.c +++ b/epan/dissectors/packet-rtps.c @@ -3934,9 +3934,9 @@ static void rtps_util_add_timestamp_sec_and_fraction(proto_tree *tree, frac = tvb_get_guint32(tvb, offset+4, encoding); if ((sec == 0x7fffffff) && (frac == 0xffffffff)) { - g_strlcpy(tempBuffer, "INFINITE", MAX_TIMESTAMP_SIZE); + (void) g_strlcpy(tempBuffer, "INFINITE", MAX_TIMESTAMP_SIZE); } else if ((sec == 0) && (frac == 0)) { - g_strlcpy(tempBuffer, "0 sec", MAX_TIMESTAMP_SIZE); + (void) g_strlcpy(tempBuffer, "0 sec", MAX_TIMESTAMP_SIZE); } else { absolute = (gdouble)sec + (gdouble)frac / ((gdouble)(0x80000000) * 2.0); g_snprintf(tempBuffer, MAX_TIMESTAMP_SIZE, @@ -4228,7 +4228,7 @@ static gint rtps_util_add_typecode(proto_tree *tree, tvbuff_t *tvb, gint offset, ++tk_id; } - g_strlcpy(type_name, rtps_util_typecode_id_to_string(tk_id), 40); + (void) g_strlcpy(type_name, rtps_util_typecode_id_to_string(tk_id), 40); /* Structure of the typecode data: * @@ -4399,7 +4399,7 @@ static gint rtps_util_add_typecode(proto_tree *tree, tvbuff_t *tvb, gint offset, member_name, -1, NULL, ndds_40_hack); } /* Finally prints the name of the struct (if provided) */ - g_strlcpy(type_name, "}", 40); + (void) g_strlcpy(type_name, "}", 40); break; } /* end of case UNION */ @@ -4570,7 +4570,7 @@ static gint rtps_util_add_typecode(proto_tree *tree, tvbuff_t *tvb, gint offset, } } /* Finally prints the name of the struct (if provided) */ - g_strlcpy(type_name, "}", 40); + (void) g_strlcpy(type_name, "}", 40); break; } @@ -4662,7 +4662,7 @@ static gint rtps_util_add_typecode(proto_tree *tree, tvbuff_t *tvb, gint offset, offset += 4; alias_name = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, alias_name_length, ENC_ASCII); offset += alias_name_length; - g_strlcpy(type_name, alias_name, 40); + (void) g_strlcpy(type_name, alias_name, 40); break; } @@ -4861,7 +4861,7 @@ static gint rtps_util_add_type_library_type(proto_tree *tree, long_number = tvb_get_guint32(tvb, offset_tmp, encoding); name = tvb_get_string_enc(wmem_packet_scope(), tvb, offset_tmp+4, long_number, ENC_ASCII); if (info) - g_strlcpy(info->member_name, name, long_number); + (void) g_strlcpy(info->member_name, name, long_number); proto_item_append_text(tree, " %s", name); offset += member_length; @@ -5037,13 +5037,13 @@ static gint rtps_util_add_type_member(proto_tree *tree, proto_item_append_text(tree, " %s (ID: %d)", name, member_id); if (member_object) { member_object->member_id = member_id; - g_strlcpy(member_object->member_name, name, long_number < 256 ? long_number : 256); + (void) g_strlcpy(member_object->member_name, name, long_number < 256 ? long_number : 256); member_object->type_id = member_type_id; } if (info && info->extensibility == EXTENSIBILITY_MUTABLE) { mutable_member_mapping * mutable_mapping = NULL; mutable_mapping = wmem_new(wmem_file_scope(), mutable_member_mapping); - g_strlcpy(mutable_mapping->member_name, name, long_number < 256 ? long_number : 256); + (void) g_strlcpy(mutable_mapping->member_name, name, long_number < 256 ? long_number : 256); mutable_mapping->struct_type_id = info->type_id; mutable_mapping->member_type_id = member_type_id; mutable_mapping->member_id = member_id; @@ -5098,7 +5098,7 @@ static gint rtps_util_add_type_union_member(proto_tree *tree, union_member_mapping * mapping = NULL; mapping = wmem_new(wmem_file_scope(), union_member_mapping); - g_strlcpy(mapping->member_name, object.member_name, 256); + (void) g_strlcpy(mapping->member_name, object.member_name, 256); mapping->member_type_id = object.type_id; mapping->discriminator = HASHMAP_DISCRIMINATOR_CONSTANT; mapping->union_type_id = union_type_id + mapping->discriminator; @@ -5111,7 +5111,7 @@ static gint rtps_util_add_type_union_member(proto_tree *tree, union_member_mapping * mapping = NULL; mapping = wmem_new(wmem_file_scope(), union_member_mapping); - g_strlcpy(mapping->member_name, object.member_name, 256); + (void) g_strlcpy(mapping->member_name, object.member_name, 256); mapping->member_type_id = object.type_id; mapping->discriminator = -1; mapping->union_type_id = union_type_id + mapping->discriminator; @@ -5131,7 +5131,7 @@ static gint rtps_util_add_type_union_member(proto_tree *tree, ti = proto_tree_add_item(labels, hf_rtps_type_object_union_label, tvb, offset_tmp, 4, encoding); offset_tmp += 4; - g_strlcpy(mapping->member_name, object.member_name, 256); + (void) g_strlcpy(mapping->member_name, object.member_name, 256); mapping->member_type_id = object.type_id; mapping->discriminator = discriminator_case; mapping->union_type_id = union_type_id + discriminator_case; @@ -5733,13 +5733,13 @@ static void rtps_util_store_type_mapping(packet_info *pinfo _U_, tvbuff_t *tvb, break; } case TOPIC_INFO_ADD_TOPIC_NAME: { - g_strlcpy(type_mapping_object->topic_name, value, MAX_TOPIC_AND_TYPE_LENGTH); + (void) g_strlcpy(type_mapping_object->topic_name, value, MAX_TOPIC_AND_TYPE_LENGTH); type_mapping_object->fields_visited = type_mapping_object->fields_visited | TOPIC_INFO_ADD_TOPIC_NAME; break; } case TOPIC_INFO_ADD_TYPE_NAME: { - g_strlcpy(type_mapping_object->type_name, value, MAX_TOPIC_AND_TYPE_LENGTH); + (void) g_strlcpy(type_mapping_object->type_name, value, MAX_TOPIC_AND_TYPE_LENGTH); type_mapping_object->fields_visited = type_mapping_object->fields_visited | TOPIC_INFO_ADD_TYPE_NAME; break; diff --git a/epan/dissectors/packet-s7comm.c b/epan/dissectors/packet-s7comm.c index 0846880387..a8d26e26d0 100644 --- a/epan/dissectors/packet-s7comm.c +++ b/epan/dissectors/packet-s7comm.c @@ -2667,14 +2667,14 @@ s7comm_add_timestamp_to_tree(tvbuff_t *tvb, static void make_registerflag_string(gchar *str, guint8 flags, gint max) { - g_strlcpy(str, "", max); - if (flags & 0x01) g_strlcat(str, "STW, ", max); - if (flags & 0x02) g_strlcat(str, "ACCU1, ", max); - if (flags & 0x04) g_strlcat(str, "ACCU2, ", max); - if (flags & 0x08) g_strlcat(str, "AR1, ", max); - if (flags & 0x10) g_strlcat(str, "AR2, ", max); - if (flags & 0x20) g_strlcat(str, "DB1, ", max); - if (flags & 0x40) g_strlcat(str, "DB2, ", max); + (void) g_strlcpy(str, "", max); + if (flags & 0x01) (void) g_strlcat(str, "STW, ", max); + if (flags & 0x02) (void) g_strlcat(str, "ACCU1, ", max); + if (flags & 0x04) (void) g_strlcat(str, "ACCU2, ", max); + if (flags & 0x08) (void) g_strlcat(str, "AR1, ", max); + if (flags & 0x10) (void) g_strlcat(str, "AR2, ", max); + if (flags & 0x20) (void) g_strlcat(str, "DB1, ", max); + if (flags & 0x40) (void) g_strlcat(str, "DB2, ", max); if (strlen(str) > 2) str[strlen(str) - 2 ] = '\0'; } @@ -5389,15 +5389,15 @@ s7comm_decode_message_service(tvbuff_t *tvb, proto_tree_add_item(data_tree, hf_s7comm_cpu_msgservice_req_reserved1, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - g_strlcpy(events_string, "", sizeof(events_string)); - if (events & 0x01) g_strlcat(events_string, "MODE,", sizeof(events_string)); /* Change in mode-transition: Stop, Run, by Push and Function-group=0, Subfunction: 0=Stop, 1=Warm Restart, 2=RUN */ - if (events & 0x02) g_strlcat(events_string, "SYS,", sizeof(events_string)); /* System diagnostics */ - if (events & 0x04) g_strlcat(events_string, "USR,", sizeof(events_string)); /* User-defined diagnostic messages */ - if (events & 0x08) g_strlcat(events_string, "-4-,", sizeof(events_string)); /* currently unknown flag */ - if (events & 0x10) g_strlcat(events_string, "-5-,", sizeof(events_string)); /* currently unknown flag */ - if (events & 0x20) g_strlcat(events_string, "-6-,", sizeof(events_string)); /* currently unknown flag */ - if (events & 0x40) g_strlcat(events_string, "-7-,", sizeof(events_string)); /* currently unknown flag */ - if (events & 0x80) g_strlcat(events_string, "ALM,", sizeof(events_string)); /* Program block message, type of message in additional field */ + (void) g_strlcpy(events_string, "", sizeof(events_string)); + if (events & 0x01) (void) g_strlcat(events_string, "MODE,", sizeof(events_string)); /* Change in mode-transition: Stop, Run, by Push and Function-group=0, Subfunction: 0=Stop, 1=Warm Restart, 2=RUN */ + if (events & 0x02) (void) g_strlcat(events_string, "SYS,", sizeof(events_string)); /* System diagnostics */ + if (events & 0x04) (void) g_strlcat(events_string, "USR,", sizeof(events_string)); /* User-defined diagnostic messages */ + if (events & 0x08) (void) g_strlcat(events_string, "-4-,", sizeof(events_string)); /* currently unknown flag */ + if (events & 0x10) (void) g_strlcat(events_string, "-5-,", sizeof(events_string)); /* currently unknown flag */ + if (events & 0x20) (void) g_strlcat(events_string, "-6-,", sizeof(events_string)); /* currently unknown flag */ + if (events & 0x40) (void) g_strlcat(events_string, "-7-,", sizeof(events_string)); /* currently unknown flag */ + if (events & 0x80) (void) g_strlcat(events_string, "ALM,", sizeof(events_string)); /* Program block message, type of message in additional field */ if (strlen(events_string) > 2) events_string[strlen(events_string) - 1 ] = '\0'; col_append_fstr(pinfo->cinfo, COL_INFO, " SubscribedEvents=(%s)", events_string); diff --git a/epan/dissectors/packet-sccp.c b/epan/dissectors/packet-sccp.c index f092930855..0c7b9f16cf 100644 --- a/epan/dissectors/packet-sccp.c +++ b/epan/dissectors/packet-sccp.c @@ -1756,12 +1756,12 @@ dissect_sccp_gt_address_information(tvbuff_t *tvb, packet_info *pinfo, even_signal = tvb_get_guint8(tvb, offset) & GT_EVEN_SIGNAL_MASK; even_signal >>= GT_EVEN_SIGNAL_SHIFT; - g_strlcat(gt_digits, val_to_str(odd_signal, sccp_address_signal_values, + (void) g_strlcat(gt_digits, val_to_str(odd_signal, sccp_address_signal_values, "Unknown: %d"), GT_MAX_SIGNALS+1); /* If the last signal is NOT filler */ if (offset != (length - 1) || even_length == TRUE) - g_strlcat(gt_digits, val_to_str(even_signal, sccp_address_signal_values, + (void) g_strlcat(gt_digits, val_to_str(even_signal, sccp_address_signal_values, "Unknown: %d"), GT_MAX_SIGNALS+1); offset += GT_SIGNAL_LENGTH; diff --git a/epan/dissectors/packet-sdp.c b/epan/dissectors/packet-sdp.c index f16d91ff60..916a6cb96e 100644 --- a/epan/dissectors/packet-sdp.c +++ b/epan/dissectors/packet-sdp.c @@ -2726,19 +2726,19 @@ dissect_sdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) if (NULL != sdp_data.ed137_fid) { col_append_fstr(pinfo->cinfo, COL_INFO, "%s ", sdp_data.ed137_fid); - g_strlcat(sdp_pi->summary_str, sdp_data.ed137_fid, 50); + (void) g_strlcat(sdp_pi->summary_str, sdp_data.ed137_fid, 50); } if (NULL != sdp_data.ed137_txrxmode) { col_append_fstr(pinfo->cinfo, COL_INFO, "%s ", sdp_data.ed137_txrxmode); if (strlen(sdp_pi->summary_str)) - g_strlcat(sdp_pi->summary_str, " ", 50); - g_strlcat(sdp_pi->summary_str, sdp_data.ed137_txrxmode, 50); + (void) g_strlcat(sdp_pi->summary_str, " ", 50); + (void) g_strlcat(sdp_pi->summary_str, sdp_data.ed137_txrxmode, 50); } if (NULL != sdp_data.ed137_type) { col_append_fstr(pinfo->cinfo, COL_INFO, "%s ", sdp_data.ed137_type); if (strlen(sdp_pi->summary_str)) - g_strlcat(sdp_pi->summary_str, " ", 50); - g_strlcat(sdp_pi->summary_str, sdp_data.ed137_type, 50); + (void) g_strlcat(sdp_pi->summary_str, " ", 50); + (void) g_strlcat(sdp_pi->summary_str, sdp_data.ed137_type, 50); } /* Done parsing media description, no more need for the session-level details. */ @@ -2795,19 +2795,19 @@ dissect_sdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) media_desc->media.pt[j]); if (payload_type_str) { if (strlen(sdp_pi->summary_str)) - g_strlcat(sdp_pi->summary_str, " ", 50); - g_strlcat(sdp_pi->summary_str, payload_type_str, 50); + (void) g_strlcat(sdp_pi->summary_str, " ", 50); + (void) g_strlcat(sdp_pi->summary_str, payload_type_str, 50); } else { char num_pt[10]; g_snprintf(num_pt, 10, "%u", media_desc->media.pt[j]); if (strlen(sdp_pi->summary_str)) - g_strlcat(sdp_pi->summary_str, " ", 50); - g_strlcat(sdp_pi->summary_str, num_pt, 50); + (void) g_strlcat(sdp_pi->summary_str, " ", 50); + (void) g_strlcat(sdp_pi->summary_str, num_pt, 50); } } else { if (strlen(sdp_pi->summary_str)) - g_strlcat(sdp_pi->summary_str, " ", 50); - g_strlcat(sdp_pi->summary_str, + (void) g_strlcat(sdp_pi->summary_str, " ", 50); + (void) g_strlcat(sdp_pi->summary_str, val_to_str_ext(media_desc->media.pt[j], &rtp_payload_type_short_vals_ext, "%u"), 50); } @@ -2819,8 +2819,8 @@ dissect_sdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) */ if ((media_desc->media_port != 0) && media_desc->proto == SDP_PROTO_T38) { if (strlen(sdp_pi->summary_str)) - g_strlcat(sdp_pi->summary_str, " ", 50); - g_strlcat(sdp_pi->summary_str, "t38", 50); + (void) g_strlcat(sdp_pi->summary_str, " ", 50); + (void) g_strlcat(sdp_pi->summary_str, "t38", 50); } } diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c index 640df06473..a8adf99e02 100644 --- a/epan/dissectors/packet-sip.c +++ b/epan/dissectors/packet-sip.c @@ -4074,7 +4074,7 @@ dissect_sip_common(tvbuff_t *tvb, int offset, int remaining_length, packet_info return offset - orig_offset; } else { - g_strlcpy(cseq_method, value+sub_value_offset, MAX_CSEQ_METHOD_SIZE); + (void) g_strlcpy(cseq_method, value+sub_value_offset, MAX_CSEQ_METHOD_SIZE); /* Add CSeq method to the tree */ if (cseq_tree) @@ -4173,7 +4173,7 @@ dissect_sip_common(tvbuff_t *tvb, int offset, int remaining_length, packet_info proto_item *gen_item; /* Store the Call-id */ - g_strlcpy(call_id, value, MAX_CALL_ID_SIZE); + (void) g_strlcpy(call_id, value, MAX_CALL_ID_SIZE); stat_info->tap_call_id = wmem_strdup(wmem_packet_scope(), call_id); /* Add 'Call-id' string item to tree */ @@ -5262,7 +5262,7 @@ guint sip_is_packet_resend(packet_info *pinfo, /* No packet entry found, consult global hash table */ /* Prepare the key */ - g_strlcpy(key.call_id, call_id, MAX_CALL_ID_SIZE); + (void) g_strlcpy(key.call_id, call_id, MAX_CALL_ID_SIZE); /* We're only using these addresses locally (for the hash lookup) so * there is no need to make a (g_malloc'd) copy of them. @@ -5291,7 +5291,7 @@ guint sip_is_packet_resend(packet_info *pinfo, if (cseq_number != p_val->cseq) { p_val->cseq = cseq_number; - g_strlcpy(p_val->method, cseq_method, MAX_CSEQ_METHOD_SIZE); + (void) g_strlcpy(p_val->method, cseq_method, MAX_CSEQ_METHOD_SIZE); p_val->transaction_state = nothing_seen; p_val->frame_number = 0; if (line_type == REQUEST_LINE) @@ -5320,7 +5320,7 @@ guint sip_is_packet_resend(packet_info *pinfo, } p_val->cseq = cseq_number; - g_strlcpy(p_val->method, cseq_method, MAX_CSEQ_METHOD_SIZE); + (void) g_strlcpy(p_val->method, cseq_method, MAX_CSEQ_METHOD_SIZE); p_val->transaction_state = nothing_seen; if (line_type == REQUEST_LINE) { @@ -5461,7 +5461,7 @@ guint sip_find_request(packet_info *pinfo, /* No packet entry found, consult global hash table */ /* Prepare the key */ - g_strlcpy(key.call_id, call_id, MAX_CALL_ID_SIZE); + (void) g_strlcpy(key.call_id, call_id, MAX_CALL_ID_SIZE); /* Looking for matching request, so reverse addresses for this lookup */ set_address(&key.dest_address, pinfo->net_src.type, pinfo->net_src.len, @@ -5575,7 +5575,7 @@ guint sip_find_invite(packet_info *pinfo, /* No packet entry found, consult global hash table */ /* Prepare the key */ - g_strlcpy(key.call_id, call_id, MAX_CALL_ID_SIZE); + (void) g_strlcpy(key.call_id, call_id, MAX_CALL_ID_SIZE); /* Looking for matching INVITE */ set_address(&key.dest_address, pinfo->net_dst.type, pinfo->net_dst.len, diff --git a/epan/dissectors/packet-smb-sidsnooping.c b/epan/dissectors/packet-smb-sidsnooping.c index 85d030b456..1a01b91f7a 100644 --- a/epan/dissectors/packet-smb-sidsnooping.c +++ b/epan/dissectors/packet-smb-sidsnooping.c @@ -175,7 +175,7 @@ samr_query_dispinfo(void *dummy _U_, packet_info *pinfo, epan_dissect_t *edt, co fi_rid=(field_info *)gp_rids->pdata[num_rids-1]; fi_name=(field_info *)gp_names->pdata[num_rids-1]; - g_strlcpy(sid_name_str, sid, 256); + (void) g_strlcpy(sid_name_str, sid, 256); sid_name_str[len++]='-'; g_snprintf(sid_name_str+len, 256-len, "%d",fi_rid->value.value.sinteger); add_sid_name_mapping(sid_name_str, fi_name->value.value.string); diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c index fc2d4f9883..34dbd09b50 100644 --- a/epan/dissectors/packet-smb.c +++ b/epan/dissectors/packet-smb.c @@ -1865,7 +1865,7 @@ get_unicode_or_ascii_string(tvbuff_t *tvb, int *offsetp, cur[copylen] = '\0'; if (overflow) - g_strlcat(cur, "...",MAX_UNICODE_STR_LEN+3+1); + (void) g_strlcat(cur, "...",MAX_UNICODE_STR_LEN+3+1); string_len = *len; string = cur; @@ -5941,7 +5941,7 @@ dissect_search_resume_key(tvbuff_t *tvb, packet_info *pinfo _U_, TRUE, TRUE, bcp); CHECK_STRING_SUBR(fn); /* ensure that it's null-terminated */ - g_strlcpy(fname, fn, 11+1); + (void) g_strlcpy(fname, fn, 11+1); proto_tree_add_string(tree, hf_smb_file_name, tvb, offset, 11, fname); COUNT_BYTES_SUBR(fn_len); @@ -6019,7 +6019,7 @@ dissect_search_dir_info(tvbuff_t *tvb, packet_info *pinfo, TRUE, TRUE, bcp); CHECK_STRING_SUBR(fn); /* ensure that it's null-terminated */ - g_strlcpy(fname, fn, 13+1); + (void) g_strlcpy(fname, fn, 13+1); proto_tree_add_string(tree, hf_smb_file_name, tvb, offset, fn_len, fname); COUNT_BYTES_SUBR(fn_len); diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c index a70e7c60d2..b99c3b59d5 100644 --- a/epan/dissectors/packet-snmp.c +++ b/epan/dissectors/packet-snmp.c @@ -883,7 +883,7 @@ dissect_snmp_VarBind(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pi = proto_tree_add_item(pt_varbind,hfid,tvb,value_offset,value_len,ENC_BIG_ENDIAN); expert_add_info_format(actx->pinfo, pi, &ei_snmp_varbind_response, "%s",note); - g_strlcpy (label, note, ITEM_LABEL_LENGTH); + (void) g_strlcpy (label, note, ITEM_LABEL_LENGTH); goto set_label; } diff --git a/epan/dissectors/packet-snort-config.c b/epan/dissectors/packet-snort-config.c index 0ced5c7407..e4edf75b54 100644 --- a/epan/dissectors/packet-snort-config.c +++ b/epan/dissectors/packet-snort-config.c @@ -596,16 +596,16 @@ static void process_rule_option(Rule_t *rule, char *options, int option_start_of if (colon_offset != 0) { /* Name and value */ - g_strlcpy(name, options+option_start_offset, colon_offset-option_start_offset); + (void) g_strlcpy(name, options+option_start_offset, colon_offset-option_start_offset); if (options[colon_offset] == ' ') { spaces_after_colon = 1; } - g_strlcpy(value, options+colon_offset+spaces_after_colon, options_end_offset-spaces_after_colon-colon_offset); + (void) g_strlcpy(value, options+colon_offset+spaces_after_colon, options_end_offset-spaces_after_colon-colon_offset); value_length = (gint)strlen(value); } else { /* Just name */ - g_strlcpy(name, options+option_start_offset, options_end_offset-option_start_offset); + (void) g_strlcpy(name, options+option_start_offset, options_end_offset-option_start_offset); } /* Some rule options expect a number, parse it now. Note that any space diff --git a/epan/dissectors/packet-sprt.c b/epan/dissectors/packet-sprt.c index 17bf32953c..87e543c581 100644 --- a/epan/dissectors/packet-sprt.c +++ b/epan/dissectors/packet-sprt.c @@ -807,7 +807,7 @@ void sprt_add_address(packet_info *pinfo, } /* Update the conversation data. */ - g_strlcpy(p_conv_data->method, setup_method, SPRT_CONV_MAX_SETUP_METHOD_SIZE); + (void) g_strlcpy(p_conv_data->method, setup_method, SPRT_CONV_MAX_SETUP_METHOD_SIZE); p_conv_data->frame_number = setup_frame_number; } diff --git a/epan/dissectors/packet-sua.c b/epan/dissectors/packet-sua.c index 89a74f6d7f..1196d7fed6 100644 --- a/epan/dissectors/packet-sua.c +++ b/epan/dissectors/packet-sua.c @@ -1411,12 +1411,12 @@ dissect_global_title_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tr even_signal = tvb_get_guint8(parameter_tvb, offset) & GT_EVEN_SIGNAL_MASK; even_signal >>= GT_EVEN_SIGNAL_SHIFT; - g_strlcat(gt_digits, val_to_str_const(odd_signal, sccp_address_signal_values, + (void) g_strlcat(gt_digits, val_to_str_const(odd_signal, sccp_address_signal_values, "Unknown"), GT_MAX_SIGNALS+1); /* If the last signal is NOT filler */ if (offset != (GLOBAL_TITLE_OFFSET + global_title_length - 1) || even_length == TRUE) - g_strlcat(gt_digits, val_to_str_const(even_signal, sccp_address_signal_values, + (void) g_strlcat(gt_digits, val_to_str_const(even_signal, sccp_address_signal_values, "Unknown"), GT_MAX_SIGNALS+1); offset += GT_SIGNAL_LENGTH; diff --git a/epan/dissectors/packet-t38.c b/epan/dissectors/packet-t38.c index c232021f8e..49184143ec 100644 --- a/epan/dissectors/packet-t38.c +++ b/epan/dissectors/packet-t38.c @@ -291,7 +291,7 @@ void t38_add_address(packet_info *pinfo, /* * Update the conversation data. */ - g_strlcpy(p_conversation_data->setup_method, setup_method, MAX_T38_SETUP_METHOD_SIZE); + (void) g_strlcpy(p_conversation_data->setup_method, setup_method, MAX_T38_SETUP_METHOD_SIZE); p_conversation_data->setup_frame_number = setup_frame_number; p_conversation_data->src_t38_info.reass_ID = 0; p_conversation_data->src_t38_info.reass_start_seqnum = -1; @@ -1043,7 +1043,7 @@ init_t38_info_conv(packet_info *pinfo) if (!p_t38_packet_conv) { /* copy the t38 conversation info to the packet t38 conversation */ p_t38_packet_conv = wmem_new(wmem_file_scope(), t38_conv); - g_strlcpy(p_t38_packet_conv->setup_method, p_t38_conv->setup_method, MAX_T38_SETUP_METHOD_SIZE); + (void) g_strlcpy(p_t38_packet_conv->setup_method, p_t38_conv->setup_method, MAX_T38_SETUP_METHOD_SIZE); p_t38_packet_conv->setup_frame_number = p_t38_conv->setup_frame_number; memcpy(&(p_t38_packet_conv->src_t38_info), &(p_t38_conv->src_t38_info), sizeof(t38_conv_info)); diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c index 6c83fed55f..3410f3b24e 100644 --- a/epan/dissectors/packet-tcap.c +++ b/epan/dissectors/packet-tcap.c @@ -3184,7 +3184,7 @@ dissect_tcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d */ if ( p_tcap_context && cur_oid && !p_tcap_context->oid_present ) { /* Save the application context and the sub dissector */ - g_strlcpy(p_tcap_context->oid, cur_oid, sizeof(p_tcap_context->oid)); + (void) g_strlcpy(p_tcap_context->oid, cur_oid, sizeof(p_tcap_context->oid)); p_tcap_context->oid_present=TRUE; if ( (subdissector_handle = dissector_get_string_handle(ber_oid_dissector_table, cur_oid)) ) { p_tcap_context->subdissector_handle=subdissector_handle; @@ -3838,7 +3838,7 @@ dissect_tcap_ITU_ComponentPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs /* ACN, changed, Fallback to lower version * and update the subdissector (purely formal) */ - g_strlcpy(p_tcap_context->oid, cur_oid, sizeof(p_tcap_context->oid)); + (void) g_strlcpy(p_tcap_context->oid, cur_oid, sizeof(p_tcap_context->oid)); if ((subdissector_handle = dissector_get_string_handle(ber_oid_dissector_table, cur_oid))) { p_tcap_context->subdissector_handle = subdissector_handle; p_tcap_context->subdissector_present = TRUE; @@ -3846,7 +3846,7 @@ dissect_tcap_ITU_ComponentPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs } } else { /* We do not have the OID in the TCAP context, so store it */ - g_strlcpy(p_tcap_context->oid, cur_oid, sizeof(p_tcap_context->oid)); + (void) g_strlcpy(p_tcap_context->oid, cur_oid, sizeof(p_tcap_context->oid)); p_tcap_context->oid_present = TRUE; /* Try to find a subdissector according to OID */ if ((subdissector_handle diff --git a/epan/dissectors/packet-telnet.c b/epan/dissectors/packet-telnet.c index c661454b73..36fcc55202 100644 --- a/epan/dissectors/packet-telnet.c +++ b/epan/dissectors/packet-telnet.c @@ -781,9 +781,9 @@ dissect_comport_subopt(packet_info *pinfo, const char *optname, tvbuff_t *tvb, i int bit = ls & 1; if (bit) { if (print_count != 0) { - g_strlcat(ls_buffer,", ",512); + (void) g_strlcat(ls_buffer,", ",512); } - g_strlcat(ls_buffer,linestate_bits[idx], 512); + (void) g_strlcat(ls_buffer,linestate_bits[idx], 512); print_count++; } ls = ls >> 1; @@ -813,9 +813,9 @@ dissect_comport_subopt(packet_info *pinfo, const char *optname, tvbuff_t *tvb, i int bit = ms & 1; if (bit) { if (print_count != 0) { - g_strlcat(ms_buffer,", ",256); + (void) g_strlcat(ms_buffer,", ",256); } - g_strlcat(ms_buffer,modemstate_bits[idx],256); + (void) g_strlcat(ms_buffer,modemstate_bits[idx],256); print_count++; } ms = ms >> 1; diff --git a/epan/dissectors/packet-tpncp.c b/epan/dissectors/packet-tpncp.c index 936a09bb3b..d8f5be9455 100644 --- a/epan/dissectors/packet-tpncp.c +++ b/epan/dissectors/packet-tpncp.c @@ -507,7 +507,7 @@ fill_enums_id_vals(FILE *file) first_entry = FALSE; } tpncp_enums_name_vals[enum_val] = wmem_strdup(wmem_epan_scope(), enum_name); - g_strlcpy(enum_type, enum_name, MAX_TPNCP_DB_ENTRY_LEN); + (void) g_strlcpy(enum_type, enum_name, MAX_TPNCP_DB_ENTRY_LEN); } tpncp_enums_id_vals[enum_val][i].strptr = wmem_strdup(wmem_epan_scope(), enum_str); tpncp_enums_id_vals[enum_val][i].value = enum_id; diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c index 2ee6132c6d..ad0289a66a 100644 --- a/epan/dissectors/packet-usb.c +++ b/epan/dissectors/packet-usb.c @@ -1613,7 +1613,7 @@ static int usb_addr_to_str(const address* addr, gchar *buf, int buf_len _U_) const guint8 *addrp = (const guint8 *)addr->data; if(pletoh32(&addrp[0])==0xffffffff){ - g_strlcpy(buf, "host", buf_len); + (void) g_strlcpy(buf, "host", buf_len); } else { g_snprintf(buf, buf_len, "%d.%d.%d", pletoh16(&addrp[8]), pletoh32(&addrp[0]), pletoh32(&addrp[4])); diff --git a/epan/dissectors/packet-usbll.c b/epan/dissectors/packet-usbll.c index a22ead8f68..501c3fc43c 100644 --- a/epan/dissectors/packet-usbll.c +++ b/epan/dissectors/packet-usbll.c @@ -627,9 +627,9 @@ static int usbll_addr_to_str(const address* addr, gchar *buf, int buf_len) const usbll_address_t *addrp = (const usbll_address_t *)addr->data; if (addrp->flags & USBLL_ADDRESS_HOST) { - g_strlcpy(buf, "host", buf_len); + (void) g_strlcpy(buf, "host", buf_len); } else if (addrp->flags & USBLL_ADDRESS_BROADCAST) { - g_strlcpy(buf, "broadcast", buf_len); + (void) g_strlcpy(buf, "broadcast", buf_len); } else if (addrp->flags & USBLL_ADDRESS_HUB_PORT) { /* * In split transaction we use : to mark that the last part is port not diff --git a/epan/dissectors/packet-vsock.c b/epan/dissectors/packet-vsock.c index ba98c18749..73899a162a 100644 --- a/epan/dissectors/packet-vsock.c +++ b/epan/dissectors/packet-vsock.c @@ -102,7 +102,7 @@ static int vsock_addr_to_str(const address* addr, gchar *buf, int buf_len) const guint8 *addrp = (const guint8 *)addr->data; if(pletoh64(&addrp[0])==2){ - g_strlcpy(buf, "host", buf_len); + (void) g_strlcpy(buf, "host", buf_len); } else { g_snprintf(buf, buf_len, "%" G_GINT64_MODIFIER "u", pletoh64(&addrp[0])); } diff --git a/epan/dissectors/packet-x509if.c b/epan/dissectors/packet-x509if.c index 45814f26d7..12ae4d5f7d 100644 --- a/epan/dissectors/packet-x509if.c +++ b/epan/dissectors/packet-x509if.c @@ -720,8 +720,8 @@ dissect_x509if_T_type_02(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse if(!name) name = actx->external.direct_reference; if(last_rdn) { /* append it to the RDN */ - g_strlcat(last_rdn, name, MAX_RDN_STR_LEN); - g_strlcat(last_rdn, "=", MAX_RDN_STR_LEN); + (void) g_strlcat(last_rdn, name, MAX_RDN_STR_LEN); + (void) g_strlcat(last_rdn, "=", MAX_RDN_STR_LEN); /* append it to the tree */ proto_item_append_text(tree, " (%s=", name); @@ -776,7 +776,7 @@ dissect_x509if_T_atadv_value(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o value = tvb_format_text(out_tvb, 0, tvb_reported_length(out_tvb)); if(last_rdn) { - g_strlcat(last_rdn, value, MAX_RDN_STR_LEN); + (void) g_strlcat(last_rdn, value, MAX_RDN_STR_LEN); /* append it to the tree*/ proto_item_append_text(tree, "%s)", value); @@ -872,7 +872,7 @@ dissect_x509if_RelativeDistinguishedName_item(gboolean implicit_tag _U_, tvbuff_ if(last_rdn) /* this is an additional value - delimit */ - g_strlcat(last_rdn, "+", MAX_RDN_STR_LEN); + (void) g_strlcat(last_rdn, "+", MAX_RDN_STR_LEN); } offset = dissect_x509if_AttributeTypeAndDistinguishedValue(implicit_tag, tvb, offset, actx, tree, hf_index); @@ -912,9 +912,9 @@ dissect_x509if_RelativeDistinguishedName(gboolean implicit_tag _U_, tvbuff_t *tv if(*last_dn) { temp_dn = (char *)wmem_strdup_printf(wmem_packet_scope(), "%s,%s", last_rdn, last_dn); last_dn[0] = '\0'; - g_strlcat(last_dn, temp_dn, MAX_DN_STR_LEN); + (void) g_strlcat(last_dn, temp_dn, MAX_DN_STR_LEN); } else { - g_strlcat(last_dn, last_rdn, MAX_DN_STR_LEN); + (void) g_strlcat(last_dn, last_rdn, MAX_DN_STR_LEN); } } diff --git a/epan/expert.c b/epan/expert.c index 8052d04047..9a4b8c1cba 100644 --- a/epan/expert.c +++ b/epan/expert.c @@ -557,7 +557,7 @@ expert_set_info_vformat(packet_info *pinfo, proto_item *pi, int group, int sever if (use_vaformat) { vsnprintf(formatted, ITEM_LABEL_LENGTH, format, ap); } else { - g_strlcpy(formatted, format, ITEM_LABEL_LENGTH); + (void) g_strlcpy(formatted, format, ITEM_LABEL_LENGTH); } tree = expert_create_tree(pi, group, severity, formatted); diff --git a/epan/ftypes/ftype-bytes.c b/epan/ftypes/ftype-bytes.c index dc414e3e62..31952e7521 100644 --- a/epan/ftypes/ftype-bytes.c +++ b/epan/ftypes/ftype-bytes.c @@ -93,7 +93,7 @@ oid_to_repr(fvalue_t *fv, ftrepr_t rtype _U_, int field_display _U_, char *buf, * I guess that is why this callback is not passed a length. * -- lego */ - g_strlcpy(buf,oid_str,OID_REPR_LEN(fv)); + (void) g_strlcpy(buf,oid_str,OID_REPR_LEN(fv)); wmem_free(NULL, oid_str); } @@ -115,7 +115,7 @@ rel_oid_to_repr(fvalue_t *fv, ftrepr_t rtype _U_, int field_display _U_, char *b * -- lego */ *buf++ = '.'; - g_strlcpy(buf,oid_str,REL_OID_REPR_LEN(fv)); + (void) g_strlcpy(buf,oid_str,REL_OID_REPR_LEN(fv)); wmem_free(NULL, oid_str); } diff --git a/epan/ftypes/ftype-ieee-11073-float.c b/epan/ftypes/ftype-ieee-11073-float.c index f7fe7e7bfd..4f5371f4ab 100644 --- a/epan/ftypes/ftype-ieee-11073-float.c +++ b/epan/ftypes/ftype-ieee-11073-float.c @@ -214,19 +214,19 @@ sfloat_ieee_11073_val_to_repr(fvalue_t *fv, ftrepr_t rtype _U_, int field_displa if (fv->value.sfloat_ieee_11073 >= 0x07FE && fv->value.sfloat_ieee_11073 <= 0x0802) { switch (fv->value.sfloat_ieee_11073) { case SFLOAT_VALUE_INFINITY_PLUS: - g_strlcpy(buf, "+INFINITY", size); + (void) g_strlcpy(buf, "+INFINITY", size); break; case SFLOAT_VALUE_NAN: - g_strlcpy(buf, "NaN", size); + (void) g_strlcpy(buf, "NaN", size); break; case SFLOAT_VALUE_NRES: - g_strlcpy(buf, "NRes", size); + (void) g_strlcpy(buf, "NRes", size); break; case SFLOAT_VALUE_RFU: - g_strlcpy(buf, "RFU", size); + (void) g_strlcpy(buf, "RFU", size); break; case SFLOAT_VALUE_INFINITY_MINUS: - g_strlcpy(buf, "-INFINITY", size); + (void) g_strlcpy(buf, "-INFINITY", size); break; } return; @@ -910,19 +910,19 @@ float_ieee_11073_val_to_repr(fvalue_t *fv, ftrepr_t rtype _U_, int field_display if (fv->value.float_ieee_11073 >= 0x007FFFFE && fv->value.float_ieee_11073 <= 0x00800002) { switch (fv->value.float_ieee_11073) { case FLOAT_VALUE_INFINITY_PLUS: - g_strlcpy(buf, "+INFINITY", size); + (void) g_strlcpy(buf, "+INFINITY", size); break; case FLOAT_VALUE_NAN: - g_strlcpy(buf, "NaN", size); + (void) g_strlcpy(buf, "NaN", size); break; case FLOAT_VALUE_NRES: - g_strlcpy(buf, "NRes", size); + (void) g_strlcpy(buf, "NRes", size); break; case FLOAT_VALUE_RFU: - g_strlcpy(buf, "RFU", size); + (void) g_strlcpy(buf, "RFU", size); break; case FLOAT_VALUE_INFINITY_MINUS: - g_strlcpy(buf, "-INFINITY", size); + (void) g_strlcpy(buf, "-INFINITY", size); break; } } diff --git a/epan/ftypes/ftype-string.c b/epan/ftypes/ftype-string.c index c42f08d928..9e37fb8b67 100644 --- a/epan/ftypes/ftype-string.c +++ b/epan/ftypes/ftype-string.c @@ -58,7 +58,7 @@ string_to_repr(fvalue_t *fv, ftrepr_t rtype, int field_display _U_, char *buf, u { switch (rtype) { case FTREPR_DISPLAY: - g_strlcpy(buf, fv->value.string, size); + (void) g_strlcpy(buf, fv->value.string, size); return; case FTREPR_DFILTER: diff --git a/epan/ftypes/ftype-time.c b/epan/ftypes/ftype-time.c index aa524d235d..781bf4a5f3 100644 --- a/epan/ftypes/ftype-time.c +++ b/epan/ftypes/ftype-time.c @@ -363,7 +363,7 @@ absolute_val_to_repr(fvalue_t *fv, ftrepr_t rtype, int field_display, char *buf, *buf++ = '\"'; } - g_strlcpy(buf, rep, size); + (void) g_strlcpy(buf, rep, size); if (rtype == FTREPR_DFILTER) { buf += strlen(rep); @@ -391,7 +391,7 @@ relative_val_to_repr(fvalue_t *fv, ftrepr_t rtype _U_, int field_display _U_, ch { gchar *rep; rep = rel_time_to_secs_str(NULL, &fv->value.time); - g_strlcpy(buf, rep, size); + (void) g_strlcpy(buf, rep, size); wmem_free(NULL, rep); } diff --git a/epan/maxmind_db.c b/epan/maxmind_db.c index 7f49d1a9f4..0489605726 100644 --- a/epan/maxmind_db.c +++ b/epan/maxmind_db.c @@ -280,7 +280,7 @@ read_mmdbr_stdout_worker(gpointer data _U_) { if (line[0] == '[' && line_len > 2) { // [init] or resolved address in square brackets. line[line_len - 1] = '\0'; - g_strlcpy(cur_addr, line + 1, WS_INET6_ADDRSTRLEN); + (void) g_strlcpy(cur_addr, line + 1, WS_INET6_ADDRSTRLEN); if (ws_inet_pton4(cur_addr, &response->ipv4_addr)) { response->is_ipv4 = TRUE; } else if (ws_inet_pton6(cur_addr, &response->ipv6_addr)) { diff --git a/epan/osi-utils.c b/epan/osi-utils.c index 0b2c19da1e..a8a104e7e3 100644 --- a/epan/osi-utils.c +++ b/epan/osi-utils.c @@ -50,7 +50,7 @@ print_nsap_net_buf( const guint8 *ad, int length, gchar *buf, int buf_len) /* to do : NSAP / NET decoding */ if ( (length <= 0 ) || ( length > MAX_NSAP_LEN ) ) { - g_strlcpy(buf, "<Invalid length of NSAP>", buf_len); + (void) g_strlcpy(buf, "<Invalid length of NSAP>", buf_len); return; } cur = buf; @@ -94,7 +94,7 @@ print_system_id_buf( const guint8 *ad, int length, gchar *buf, int buf_len) int tmp; if ( ( length <= 0 ) || ( length > MAX_SYSTEMID_LEN ) ) { - g_strlcpy(buf, "<Invalid length of SYSTEM ID>", buf_len); + (void) g_strlcpy(buf, "<Invalid length of SYSTEM ID>", buf_len); return; } @@ -176,7 +176,7 @@ print_address_prefix_buf(const guint8 *ad, int length, gchar *buf, int buf_len) /* to do : all real area decoding now: NET is assumed if id len is 1 more byte */ if (length <= 0 || length > MAX_AREA_LEN*2) { - g_strlcpy(buf, "<Invalid length of AREA>", buf_len); + (void) g_strlcpy(buf, "<Invalid length of AREA>", buf_len); return; } diff --git a/epan/print.c b/epan/print.c index d7ae606564..7af041f7e9 100644 --- a/epan/print.c +++ b/epan/print.c @@ -712,7 +712,7 @@ write_json_index(json_dumper *dumper, epan_dissect_t *edt) if (timeinfo != NULL) { strftime(ts, sizeof(ts), "%Y-%m-%d", timeinfo); } else { - g_strlcpy(ts, "XXXX-XX-XX", sizeof(ts)); /* XXX - better way of saying "Not representable"? */ + (void) g_strlcpy(ts, "XXXX-XX-XX", sizeof(ts)); /* XXX - better way of saying "Not representable"? */ } json_dumper_set_member_name(dumper, "_index"); str = g_strdup_printf("packets-%s", ts); @@ -1781,23 +1781,23 @@ print_escaped_xml(FILE *fh, const char *unescaped_string) for (p = unescaped_string; *p != '\0'; p++) { switch (*p) { case '&': - g_strlcpy(&temp_buffer[offset], "&", ESCAPED_BUFFER_MAX-offset); + (void) g_strlcpy(&temp_buffer[offset], "&", ESCAPED_BUFFER_MAX-offset); offset += 5; break; case '<': - g_strlcpy(&temp_buffer[offset], "<", ESCAPED_BUFFER_MAX-offset); + (void) g_strlcpy(&temp_buffer[offset], "<", ESCAPED_BUFFER_MAX-offset); offset += 4; break; case '>': - g_strlcpy(&temp_buffer[offset], ">", ESCAPED_BUFFER_MAX-offset); + (void) g_strlcpy(&temp_buffer[offset], ">", ESCAPED_BUFFER_MAX-offset); offset += 4; break; case '"': - g_strlcpy(&temp_buffer[offset], """, ESCAPED_BUFFER_MAX-offset); + (void) g_strlcpy(&temp_buffer[offset], """, ESCAPED_BUFFER_MAX-offset); offset += 6; break; case '\'': - g_strlcpy(&temp_buffer[offset], "'", ESCAPED_BUFFER_MAX-offset); + (void) g_strlcpy(&temp_buffer[offset], "'", ESCAPED_BUFFER_MAX-offset); offset += 6; break; default: diff --git a/epan/proto.c b/epan/proto.c index deff1ad502..2698d9b9af 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -6763,7 +6763,7 @@ proto_custom_set(proto_tree* tree, GSList *field_ids, gint occurrence, } else { number_out = hfinfo_char_value_format(hfinfo, number_buf, number); - g_strlcpy(expr+offset_e, number_out, size-offset_e); + (void) g_strlcpy(expr+offset_e, number_out, size-offset_e); } offset_e = (int)strlen(expr); @@ -6797,7 +6797,7 @@ proto_custom_set(proto_tree* tree, GSList *field_ids, gint occurrence, } else { number_out = hfinfo_numeric_value_format(hfinfo, number_buf, number); - g_strlcpy(expr+offset_e, number_out, size-offset_e); + (void) g_strlcpy(expr+offset_e, number_out, size-offset_e); } offset_e = (int)strlen(expr); @@ -6827,7 +6827,7 @@ proto_custom_set(proto_tree* tree, GSList *field_ids, gint occurrence, } else { number_out = hfinfo_numeric_value_format64(hfinfo, number_buf, number64); - g_strlcpy(expr+offset_e, number_out, size-offset_e); + (void) g_strlcpy(expr+offset_e, number_out, size-offset_e); } offset_e = (int)strlen(expr); @@ -6895,7 +6895,7 @@ proto_custom_set(proto_tree* tree, GSList *field_ids, gint occurrence, default: /* for all others, just copy "result" to "expr" */ - g_strlcpy(expr, result, size); + (void) g_strlcpy(expr, result, size); break; } @@ -6999,13 +6999,13 @@ proto_item_prepend_text(proto_item *pi, const char *format, ...) ITEM_LABEL_NEW(PNODE_POOL(pi), fi->rep); proto_item_fill_label(fi, representation); } else - g_strlcpy(representation, fi->rep->representation, ITEM_LABEL_LENGTH); + (void) g_strlcpy(representation, fi->rep->representation, ITEM_LABEL_LENGTH); va_start(ap, format); g_vsnprintf(fi->rep->representation, ITEM_LABEL_LENGTH, format, ap); va_end(ap); - g_strlcat(fi->rep->representation, representation, ITEM_LABEL_LENGTH); + (void) g_strlcat(fi->rep->representation, representation, ITEM_LABEL_LENGTH); } } @@ -8965,7 +8965,7 @@ label_mark_truncated(char *label_str, gsize name_pos) *last_char = '\0'; } else if (name_pos < ITEM_LABEL_LENGTH) - g_strlcpy(label_str + name_pos, trunc_str, ITEM_LABEL_LENGTH - name_pos); + (void) g_strlcpy(label_str + name_pos, trunc_str, ITEM_LABEL_LENGTH - name_pos); } static gsize @@ -9042,7 +9042,7 @@ proto_item_fill_label(field_info *fi, gchar *label_str) switch (hfinfo->type) { case FT_NONE: case FT_PROTOCOL: - g_strlcpy(label_str, hfinfo->name, ITEM_LABEL_LENGTH); + (void) g_strlcpy(label_str, hfinfo->name, ITEM_LABEL_LENGTH); break; case FT_BOOLEAN: @@ -12609,8 +12609,8 @@ _proto_tree_add_bits_format_value(proto_tree *tree, const int hfindex, str = decode_bits_in_field(bit_offset, no_of_bits, value); - g_strlcat(str, " = ", 256+64); - g_strlcat(str, hf_field->name, 256+64); + (void) g_strlcat(str, " = ", 256+64); + (void) g_strlcat(str, hf_field->name, 256+64); /* * This function does not receive an actual value but a dimensionless pointer to that value. diff --git a/epan/to_str.c b/epan/to_str.c index a326c2cf3b..f3420c055e 100644 --- a/epan/to_str.c +++ b/epan/to_str.c @@ -329,7 +329,7 @@ guint32_to_str_buf(guint32 u, gchar *buf, int buf_len) gchar *bp = &buf[str_len]; if (buf_len < str_len) { - g_strlcpy(buf, BUF_TOO_SMALL_ERR, buf_len); /* Let the unexpected value alert user */ + (void) g_strlcpy(buf, BUF_TOO_SMALL_ERR, buf_len); /* Let the unexpected value alert user */ return; } @@ -346,7 +346,7 @@ guint64_to_str_buf(guint64 u, gchar *buf, int buf_len) gchar *bp = &buf[str_len]; if (buf_len < str_len) { - g_strlcpy(buf, BUF_TOO_SMALL_ERR, buf_len); /* Let the unexpected value alert user */ + (void) g_strlcpy(buf, BUF_TOO_SMALL_ERR, buf_len); /* Let the unexpected value alert user */ return; } @@ -1034,7 +1034,7 @@ ip_to_str_buf(const guint8 *ad, gchar *buf, const int buf_len) register gchar *b=buf; if (buf_len < WS_INET_ADDRSTRLEN) { - g_strlcpy(buf, BUF_TOO_SMALL_ERR, buf_len); /* Let the unexpected value alert user */ + (void) g_strlcpy(buf, BUF_TOO_SMALL_ERR, buf_len); /* Let the unexpected value alert user */ return; } @@ -1115,7 +1115,7 @@ guid_to_str_buf(const e_guid_t *guid, gchar *buf, int buf_len) char *tempptr = buf; if (buf_len < GUID_STR_LEN) { - g_strlcpy(buf, BUF_TOO_SMALL_ERR, buf_len);/* Let the unexpected value alert user */ + (void) g_strlcpy(buf, BUF_TOO_SMALL_ERR, buf_len);/* Let the unexpected value alert user */ return buf; } diff --git a/epan/wmem/wmem_strbuf.c b/epan/wmem/wmem_strbuf.c index 8eb46d28a5..7fdc9b6adc 100644 --- a/epan/wmem/wmem_strbuf.c +++ b/epan/wmem/wmem_strbuf.c @@ -84,7 +84,7 @@ wmem_strbuf_new(wmem_allocator_t *allocator, const gchar *str) strbuf = wmem_strbuf_sized_new(allocator, alloc_len, 0); if (str && len > 0) { - g_strlcpy(strbuf->str, str, alloc_len); + (void) g_strlcpy(strbuf->str, str, alloc_len); strbuf->len = len; } @@ -141,7 +141,7 @@ wmem_strbuf_append(wmem_strbuf_t *strbuf, const gchar *str) wmem_strbuf_grow(strbuf, append_len); - g_strlcpy(&strbuf->str[strbuf->len], str, strbuf->max_len ? WMEM_STRBUF_RAW_ROOM(strbuf) : append_len+1); + (void) g_strlcpy(&strbuf->str[strbuf->len], str, strbuf->max_len ? WMEM_STRBUF_RAW_ROOM(strbuf) : append_len+1); strbuf->len = MIN(strbuf->len + append_len, strbuf->alloc_len - 1); } diff --git a/epan/wslua/wslua_dumper.c b/epan/wslua/wslua_dumper.c index ae1ea5a5b2..0d50a9b9a5 100644 --- a/epan/wslua/wslua_dumper.c +++ b/epan/wslua/wslua_dumper.c @@ -179,7 +179,7 @@ static const char* cross_plat_fname(const char* fname) { static char fname_clean[256]; char* f; - g_strlcpy(fname_clean,fname,255); + (void) g_strlcpy(fname_clean,fname,255); fname_clean[255] = '\0'; for(f = fname_clean; *f; f++) { diff --git a/epan/wslua/wslua_util.c b/epan/wslua/wslua_util.c index 5393a8968b..d26b59cab3 100644 --- a/epan/wslua/wslua_util.c +++ b/epan/wslua/wslua_util.c @@ -329,7 +329,7 @@ WSLUA_FUNCTION wslua_apply_preferences(lua_State *L) { if (err) { /* Make a copy of pf_path because luaL_error() will return */ gchar pf_path_copy[256]; - g_strlcpy(pf_path_copy, pf_path, sizeof pf_path_copy); + (void) g_strlcpy(pf_path_copy, pf_path, sizeof pf_path_copy); g_free(pf_path); return luaL_error(L, "can't open preferences file\n\"%s\": %s.", @@ -355,7 +355,7 @@ char* wslua_get_actual_filename(const char* fname) { char* f; char* filename; - g_strlcpy(fname_clean,fname,255); + (void) g_strlcpy(fname_clean,fname,255); fname_clean[255] = '\0'; for(f = fname_clean; *f; f++) { diff --git a/plugins/epan/ethercat/packet-ecatmb.c b/plugins/epan/ethercat/packet-ecatmb.c index 2049c648bd..696a681db0 100644 --- a/plugins/epan/ethercat/packet-ecatmb.c +++ b/plugins/epan/ethercat/packet-ecatmb.c @@ -428,19 +428,19 @@ static void SoeFormatter(tvbuff_t *tvb, gint offset, char *szText, gint nMax, gu SoEIdToString(tmp, soe.anSoeHeaderDataUnion.IDN, sizeof(tmp)-1); elm[0] = '\0'; if ( soe.anSoeHeaderControlUnion.v.DataState ) - g_strlcat(elm, "D", 50); + (void) g_strlcat(elm, "D", 50); if ( soe.anSoeHeaderControlUnion.v.Name ) - g_strlcat(elm, "N", 50); + (void) g_strlcat(elm, "N", 50); if ( soe.anSoeHeaderControlUnion.v.Attribute ) - g_strlcat(elm, "A", 50); + (void) g_strlcat(elm, "A", 50); if ( soe.anSoeHeaderControlUnion.v.Unit ) - g_strlcat(elm, "U", 50); + (void) g_strlcat(elm, "U", 50); if ( soe.anSoeHeaderControlUnion.v.Min ) - g_strlcat(elm, "I", 50); + (void) g_strlcat(elm, "I", 50); if ( soe.anSoeHeaderControlUnion.v.Max ) - g_strlcat(elm, "X", 50); + (void) g_strlcat(elm, "X", 50); if ( soe.anSoeHeaderControlUnion.v.Value ) - g_strlcat(elm, "V", 50); + (void) g_strlcat(elm, "V", 50); switch ( soe.anSoeHeaderControlUnion.v.OpCode ) { case ECAT_SOE_OPCODE_RRQ: diff --git a/plugins/epan/irda/packet-ircomm.c b/plugins/epan/irda/packet-ircomm.c index 9fd378f96b..01cedce377 100644 --- a/plugins/epan/irda/packet-ircomm.c +++ b/plugins/epan/irda/packet-ircomm.c @@ -257,15 +257,15 @@ static gboolean dissect_ircomm_parameters(tvbuff_t* tvb, guint offset, packet_in pv = tvb_get_guint8(tvb, offset+2); if (pv & IRCOMM_3_WIRE_RAW) - g_strlcat(buf, ", 3-Wire raw", 256); + (void) g_strlcat(buf, ", 3-Wire raw", 256); if (pv & IRCOMM_3_WIRE) - g_strlcat(buf, ", 3-Wire", 256); + (void) g_strlcat(buf, ", 3-Wire", 256); if (pv & IRCOMM_9_WIRE) - g_strlcat(buf, ", 9-Wire", 256); + (void) g_strlcat(buf, ", 9-Wire", 256); if (pv & IRCOMM_CENTRONICS) - g_strlcat(buf, ", Centronics", 256); + (void) g_strlcat(buf, ", Centronics", 256); - g_strlcat(buf, ")", 256); + (void) g_strlcat(buf, ")", 256); if (strlen(buf) > 2) proto_item_append_text(ti, "%s", buf+2); @@ -279,11 +279,11 @@ static gboolean dissect_ircomm_parameters(tvbuff_t* tvb, guint offset, packet_in pv = tvb_get_guint8(tvb, offset+2); if (pv & IRCOMM_SERIAL) - g_strlcat(buf, ", serial", 256); + (void) g_strlcat(buf, ", serial", 256); if (pv & IRCOMM_PARALLEL) - g_strlcat(buf, ", parallel", 256); + (void) g_strlcat(buf, ", parallel", 256); - g_strlcat(buf, ")", 256); + (void) g_strlcat(buf, ")", 256); if (strlen(buf) > 2) proto_item_append_text(ti, "%s", buf+2); diff --git a/plugins/epan/irda/packet-irda.c b/plugins/epan/irda/packet-irda.c index e68fa1f1ff..9c4a7e197f 100644 --- a/plugins/epan/irda/packet-irda.c +++ b/plugins/epan/irda/packet-irda.c @@ -1272,25 +1272,25 @@ static guint dissect_negotiation(tvbuff_t* tvb, proto_tree* tree, guint offset) proto_item_append_text(ti, ": Baud Rate ("); if (pv & 0x01) - g_strlcat(buf, ", 2400", 256); + (void) g_strlcat(buf, ", 2400", 256); if (pv & 0x02) - g_strlcat(buf, ", 9600", 256); + (void) g_strlcat(buf, ", 9600", 256); if (pv & 0x04) - g_strlcat(buf, ", 19200", 256); + (void) g_strlcat(buf, ", 19200", 256); if (pv & 0x08) - g_strlcat(buf, ", 38400", 256); + (void) g_strlcat(buf, ", 38400", 256); if (pv & 0x10) - g_strlcat(buf, ", 57600", 256); + (void) g_strlcat(buf, ", 57600", 256); if (pv & 0x20) - g_strlcat(buf, ", 115200", 256); + (void) g_strlcat(buf, ", 115200", 256); if (pv & 0x40) - g_strlcat(buf, ", 576000", 256); + (void) g_strlcat(buf, ", 576000", 256); if (pv & 0x80) - g_strlcat(buf, ", 1152000", 256); + (void) g_strlcat(buf, ", 1152000", 256); if ((p_len > 1) && (tvb_get_guint8(tvb, offset+3) & 0x01)) - g_strlcat(buf, ", 4000000", 256); + (void) g_strlcat(buf, ", 4000000", 256); - g_strlcat(buf, " bps)", 256); + (void) g_strlcat(buf, " bps)", 256); proto_item_append_text(ti, "%s", buf+2); @@ -1300,15 +1300,15 @@ static guint dissect_negotiation(tvbuff_t* tvb, proto_tree* tree, guint offset) proto_item_append_text(ti, ": Maximum Turn Time ("); if (pv & 0x01) - g_strlcat(buf, ", 500", 256); + (void) g_strlcat(buf, ", 500", 256); if (pv & 0x02) - g_strlcat(buf, ", 250", 256); + (void) g_strlcat(buf, ", 250", 256); if (pv & 0x04) - g_strlcat(buf, ", 100", 256); + (void) g_strlcat(buf, ", 100", 256); if (pv & 0x08) - g_strlcat(buf, ", 50", 256); + (void) g_strlcat(buf, ", 50", 256); - g_strlcat(buf, " ms)", 256); + (void) g_strlcat(buf, " ms)", 256); proto_item_append_text(ti, "%s", buf+2); @@ -1318,19 +1318,19 @@ static guint dissect_negotiation(tvbuff_t* tvb, proto_tree* tree, guint offset) proto_item_append_text(ti, ": Data Size ("); if (pv & 0x01) - g_strlcat(buf, ", 64", 256); + (void) g_strlcat(buf, ", 64", 256); if (pv & 0x02) - g_strlcat(buf, ", 128", 256); + (void) g_strlcat(buf, ", 128", 256); if (pv & 0x04) - g_strlcat(buf, ", 256", 256); + (void) g_strlcat(buf, ", 256", 256); if (pv & 0x08) - g_strlcat(buf, ", 512", 256); + (void) g_strlcat(buf, ", 512", 256); if (pv & 0x10) - g_strlcat(buf, ", 1024", 256); + (void) g_strlcat(buf, ", 1024", 256); if (pv & 0x20) - g_strlcat(buf, ", 2048", 256); + (void) g_strlcat(buf, ", 2048", 256); - g_strlcat(buf, " bytes)", 256); + (void) g_strlcat(buf, " bytes)", 256); proto_item_append_text(ti, "%s", buf+2); @@ -1340,21 +1340,21 @@ static guint dissect_negotiation(tvbuff_t* tvb, proto_tree* tree, guint offset) proto_item_append_text(ti, ": Window Size ("); if (pv & 0x01) - g_strlcat(buf, ", 1", 256); + (void) g_strlcat(buf, ", 1", 256); if (pv & 0x02) - g_strlcat(buf, ", 2", 256); + (void) g_strlcat(buf, ", 2", 256); if (pv & 0x04) - g_strlcat(buf, ", 3", 256); + (void) g_strlcat(buf, ", 3", 256); if (pv & 0x08) - g_strlcat(buf, ", 4", 256); + (void) g_strlcat(buf, ", 4", 256); if (pv & 0x10) - g_strlcat(buf, ", 5", 256); + (void) g_strlcat(buf, ", 5", 256); if (pv & 0x20) - g_strlcat(buf, ", 6", 256); + (void) g_strlcat(buf, ", 6", 256); if (pv & 0x40) - g_strlcat(buf, ", 7", 256); + (void) g_strlcat(buf, ", 7", 256); - g_strlcat(buf, " frame window)", 256); + (void) g_strlcat(buf, " frame window)", 256); proto_item_append_text(ti, "%s", buf+2); @@ -1364,23 +1364,23 @@ static guint dissect_negotiation(tvbuff_t* tvb, proto_tree* tree, guint offset) proto_item_append_text(ti, ": Additional BOFs ("); if (pv & 0x01) - g_strlcat(buf, ", 48", 256); + (void) g_strlcat(buf, ", 48", 256); if (pv & 0x02) - g_strlcat(buf, ", 24", 256); + (void) g_strlcat(buf, ", 24", 256); if (pv & 0x04) - g_strlcat(buf, ", 12", 256); + (void) g_strlcat(buf, ", 12", 256); if (pv & 0x08) - g_strlcat(buf, ", 5", 256); + (void) g_strlcat(buf, ", 5", 256); if (pv & 0x10) - g_strlcat(buf, ", 3", 256); + (void) g_strlcat(buf, ", 3", 256); if (pv & 0x20) - g_strlcat(buf, ", 2", 256); + (void) g_strlcat(buf, ", 2", 256); if (pv & 0x40) - g_strlcat(buf, ", 1", 256); + (void) g_strlcat(buf, ", 1", 256); if (pv & 0x80) - g_strlcat(buf, ", 0", 256); + (void) g_strlcat(buf, ", 0", 256); - g_strlcat(buf, " additional BOFs at 115200)", 256); + (void) g_strlcat(buf, " additional BOFs at 115200)", 256); proto_item_append_text(ti, "%s", buf+2); @@ -1390,23 +1390,23 @@ static guint dissect_negotiation(tvbuff_t* tvb, proto_tree* tree, guint offset) proto_item_append_text(ti, ": Minimum Turn Time ("); if (pv & 0x01) - g_strlcat(buf, ", 10", 256); + (void) g_strlcat(buf, ", 10", 256); if (pv & 0x02) - g_strlcat(buf, ", 5", 256); + (void) g_strlcat(buf, ", 5", 256); if (pv & 0x04) - g_strlcat(buf, ", 1", 256); + (void) g_strlcat(buf, ", 1", 256); if (pv & 0x08) - g_strlcat(buf, ", 0.5", 256); + (void) g_strlcat(buf, ", 0.5", 256); if (pv & 0x10) - g_strlcat(buf, ", 0.1", 256); + (void) g_strlcat(buf, ", 0.1", 256); if (pv & 0x20) - g_strlcat(buf, ", 0.05", 256); + (void) g_strlcat(buf, ", 0.05", 256); if (pv & 0x40) - g_strlcat(buf, ", 0.01", 256); + (void) g_strlcat(buf, ", 0.01", 256); if (pv & 0x80) - g_strlcat(buf, ", 0", 256); + (void) g_strlcat(buf, ", 0", 256); - g_strlcat(buf, " ms)", 256); + (void) g_strlcat(buf, " ms)", 256); proto_item_append_text(ti, "%s", buf+2); @@ -1416,23 +1416,23 @@ static guint dissect_negotiation(tvbuff_t* tvb, proto_tree* tree, guint offset) proto_item_append_text(ti, ": Link Disconnect/Threshold Time ("); if (pv & 0x01) - g_strlcat(buf, ", 3/0", 256); + (void) g_strlcat(buf, ", 3/0", 256); if (pv & 0x02) - g_strlcat(buf, ", 8/3", 256); + (void) g_strlcat(buf, ", 8/3", 256); if (pv & 0x04) - g_strlcat(buf, ", 12/3", 256); + (void) g_strlcat(buf, ", 12/3", 256); if (pv & 0x08) - g_strlcat(buf, ", 16/3", 256); + (void) g_strlcat(buf, ", 16/3", 256); if (pv & 0x10) - g_strlcat(buf, ", 20/3", 256); + (void) g_strlcat(buf, ", 20/3", 256); if (pv & 0x20) - g_strlcat(buf, ", 25/3", 256); + (void) g_strlcat(buf, ", 25/3", 256); if (pv & 0x40) - g_strlcat(buf, ", 30/3", 256); + (void) g_strlcat(buf, ", 30/3", 256); if (pv & 0x80) - g_strlcat(buf, ", 40/3", 256); + (void) g_strlcat(buf, ", 40/3", 256); - g_strlcat(buf, " s)", 256); + (void) g_strlcat(buf, " s)", 256); proto_item_append_text(ti, "%s", buf+2); @@ -1556,29 +1556,29 @@ static void dissect_xid(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root, pro service_hints[0] = 0; if (hint1 & 0x01) - g_strlcat(service_hints, ", PnP Compatible", 256); + (void) g_strlcat(service_hints, ", PnP Compatible", 256); if (hint1 & 0x02) - g_strlcat(service_hints, ", PDA/Palmtop", 256); + (void) g_strlcat(service_hints, ", PDA/Palmtop", 256); if (hint1 & 0x04) - g_strlcat(service_hints, ", Computer", 256); + (void) g_strlcat(service_hints, ", Computer", 256); if (hint1 & 0x08) - g_strlcat(service_hints, ", Printer", 256); + (void) g_strlcat(service_hints, ", Printer", 256); if (hint1 & 0x10) - g_strlcat(service_hints, ", Modem", 256); + (void) g_strlcat(service_hints, ", Modem", 256); if (hint1 & 0x20) - g_strlcat(service_hints, ", Fax", 256); + (void) g_strlcat(service_hints, ", Fax", 256); if (hint1 & 0x40) - g_strlcat(service_hints, ", LAN Access", 256); + (void) g_strlcat(service_hints, ", LAN Access", 256); if (hint2 & 0x01) - g_strlcat(service_hints, ", Telephony", 256); + (void) g_strlcat(service_hints, ", Telephony", 256); if (hint2 & 0x02) - g_strlcat(service_hints, ", File Server", 256); + (void) g_strlcat(service_hints, ", File Server", 256); if (hint2 & 0x04) - g_strlcat(service_hints, ", IrCOMM", 256); + (void) g_strlcat(service_hints, ", IrCOMM", 256); if (hint2 & 0x20) - g_strlcat(service_hints, ", OBEX", 256); + (void) g_strlcat(service_hints, ", OBEX", 256); - g_strlcat(service_hints, ")", 256); + (void) g_strlcat(service_hints, ")", 256); service_hints[0] = ' '; service_hints[1] = '('; diff --git a/plugins/epan/mate/mate_util.c b/plugins/epan/mate/mate_util.c index 84cd6ca830..605c990726 100644 --- a/plugins/epan/mate/mate_util.c +++ b/plugins/epan/mate/mate_util.c @@ -127,7 +127,7 @@ gchar* scs_subscribe(SCS_collection* c, const gchar* s) { } orig = (gchar *)g_slice_alloc(len); - g_strlcpy(orig,s,len); + (void) g_strlcpy(orig,s,len); g_hash_table_insert(c->hash,orig,ip); } diff --git a/plugins/epan/profinet/packet-dcerpc-pn-io.c b/plugins/epan/profinet/packet-dcerpc-pn-io.c index c6d6ba4a55..b0f669f30b 100644 --- a/plugins/epan/profinet/packet-dcerpc-pn-io.c +++ b/plugins/epan/profinet/packet-dcerpc-pn-io.c @@ -9098,7 +9098,7 @@ dissect_ExpectedSubmoduleBlockReq_block(tvbuff_t *tvb, int offset, io_data_object = wmem_new0(wmem_file_scope(), ioDataObject); io_data_object->profisafeSupported = FALSE; io_data_object->moduleNameStr = (gchar*)wmem_alloc(wmem_file_scope(), MAX_NAMELENGTH); - g_strlcpy(io_data_object->moduleNameStr, "Unknown", MAX_NAMELENGTH); + (void) g_strlcpy(io_data_object->moduleNameStr, "Unknown", MAX_NAMELENGTH); vendorMatch = FALSE; deviceMatch = FALSE; gsdmlFoundFlag = FALSE; diff --git a/plugins/epan/profinet/packet-pn.c b/plugins/epan/profinet/packet-pn.c index b906a5dba6..c5c29cf583 100644 --- a/plugins/epan/profinet/packet-pn.c +++ b/plugins/epan/profinet/packet-pn.c @@ -1448,7 +1448,7 @@ char *pn_fgets(char *str, int n, FILE *stream) /* Check we have space left in the buffer to move the trailing bytes after the comment end */ size_t remaining_bytes = strlen(comment_end_end) + 1; if (remaining_bytes < remaining_space) { - g_strlcat(str, comment_end_end, n); + (void) g_strlcat(str, comment_end_end, n); } else { /* Seek the file back to the comment end so the next read picks it up */ diff --git a/rawshark.c b/rawshark.c index 210f6dcfa0..77f85eed66 100644 --- a/rawshark.c +++ b/rawshark.c @@ -1119,7 +1119,7 @@ static void field_display_to_string(header_field_info *hfi, char* buf, int size) { if (hfi->type != FT_BOOLEAN) { - g_strlcpy(buf, proto_field_display_to_string(hfi->display), size); + (void) g_strlcpy(buf, proto_field_display_to_string(hfi->display), size); } else { diff --git a/ringbuffer.c b/ringbuffer.c index c7d769e90c..9526d771a0 100644 --- a/ringbuffer.c +++ b/ringbuffer.c @@ -231,7 +231,7 @@ static int ringbuf_open_file(rb_file *rfile, int *err) if (tm != NULL) strftime(timestr, sizeof(timestr), "%Y%m%d%H%M%S", tm); else - g_strlcpy(timestr, "196912312359", sizeof(timestr)); /* second before the Epoch */ + (void) g_strlcpy(timestr, "196912312359", sizeof(timestr)); /* second before the Epoch */ rfile->name = g_strconcat(rb_data.fprefix, "_", filenum, "_", timestr, rb_data.fsuffix, NULL); diff --git a/sharkd_daemon.c b/sharkd_daemon.c index c356798d4b..d5b587dbed 100644 --- a/sharkd_daemon.c +++ b/sharkd_daemon.c @@ -93,7 +93,7 @@ socket_init(char *path) memset(&s_un, 0, sizeof(s_un)); s_un.sun_family = AF_UNIX; - g_strlcpy(s_un.sun_path, path, sizeof(s_un.sun_path)); + (void) g_strlcpy(s_un.sun_path, path, sizeof(s_un.sun_path)); s_un_len = (socklen_t)(offsetof(struct sockaddr_un, sun_path) + strlen(s_un.sun_path)); @@ -432,13 +432,13 @@ sharkd_loop(int argc _U_, char* argv[]) if (mode <= SHARKD_MODE_CLASSIC_DAEMON) { - g_strlcat(command_line, "sharkd.exe -", sizeof(command_line)); + (void) g_strlcat(command_line, "sharkd.exe -", sizeof(command_line)); } else { // The -m option used here is an internal-only option that notifies the child process that it should // run in Gold Console mode - g_strlcat(command_line, "sharkd.exe -m", sizeof(command_line)); + (void) g_strlcat(command_line, "sharkd.exe -m", sizeof(command_line)); for (size_t i = 1; i < argc; i++) { @@ -451,8 +451,8 @@ sharkd_loop(int argc _U_, char* argv[]) } else { - g_strlcat(command_line, " ", sizeof(command_line)); - g_strlcat(command_line, argv[i], sizeof(command_line)); + (void) g_strlcat(command_line, " ", sizeof(command_line)); + (void) g_strlcat(command_line, argv[i], sizeof(command_line)); } } } diff --git a/text2pcap.c b/text2pcap.c index 9cdee935de..331ce16203 100644 --- a/text2pcap.c +++ b/text2pcap.c @@ -940,12 +940,12 @@ append_to_preamble (char *str) if (toklen != 0) { if (packet_preamble_len + toklen > PACKET_PREAMBLE_MAX_LEN) return; /* no room to add the token to the preamble */ - g_strlcpy(&packet_preamble[packet_preamble_len], str, PACKET_PREAMBLE_MAX_LEN); + (void) g_strlcpy(&packet_preamble[packet_preamble_len], str, PACKET_PREAMBLE_MAX_LEN); packet_preamble_len += (int) toklen; if (debug >= 2) { char *c; char xs[PACKET_PREAMBLE_MAX_LEN]; - g_strlcpy(xs, packet_preamble, PACKET_PREAMBLE_MAX_LEN); + (void) g_strlcpy(xs, packet_preamble, PACKET_PREAMBLE_MAX_LEN); while ((c = strchr(xs, '\r')) != NULL) *c=' '; fprintf (stderr, "[[append_to_preamble: \"%s\"]]", xs); } diff --git a/ui/cli/tap-iostat.c b/ui/cli/tap-iostat.c index 9cc9c3484e..16306169fa 100644 --- a/ui/cli/tap-iostat.c +++ b/ui/cli/tap-iostat.c @@ -1514,7 +1514,7 @@ iostat_init(const char *opt_arg, void *userdata _U_) register_io_tap(io, i, NULL); } else { filter = (gchar *)g_malloc((pos-str)+1); - g_strlcpy( filter, str, (gsize) ((pos-str)+1)); + (void) g_strlcpy( filter, str, (gsize) ((pos-str)+1)); filter = g_strstrip(filter); register_io_tap(io, i, (char *) filter); } diff --git a/ui/cli/tap-protocolinfo.c b/ui/cli/tap-protocolinfo.c index 3ce47c854c..290f657959 100644 --- a/ui/cli/tap-protocolinfo.c +++ b/ui/cli/tap-protocolinfo.c @@ -103,7 +103,7 @@ protocolinfo_init(const char *opt_arg, void *userdata _U_) rs->hf_index = hfi->id; if ((field-filter) > 1) { rs->filter = (char *)g_malloc(field-filter); - g_strlcpy(rs->filter, filter, (field-filter)); + (void) g_strlcpy(rs->filter, filter, (field-filter)); } else { rs->filter = NULL; } diff --git a/ui/qt/sctp_chunk_statistics_dialog.cpp b/ui/qt/sctp_chunk_statistics_dialog.cpp index 0b61e9b5bd..6caa180212 100644 --- a/ui/qt/sctp_chunk_statistics_dialog.cpp +++ b/ui/qt/sctp_chunk_statistics_dialog.cpp @@ -67,10 +67,10 @@ void SCTPChunkStatisticsDialog::initializeChunkMap() temp.id = i; temp.row = i; g_snprintf(buf, sizeof buf, "%d", i); - g_strlcpy(temp.name, val_to_str_const(i, chunk_type_values, "NA"), sizeof temp.name); + (void) g_strlcpy(temp.name, val_to_str_const(i, chunk_type_values, "NA"), sizeof temp.name); if (strcmp(temp.name, "NA") == 0) { temp.hide = 1; - g_strlcpy(temp.name, buf, sizeof temp.name); + (void) g_strlcpy(temp.name, buf, sizeof temp.name); } else { temp.hide = 0; } @@ -150,7 +150,7 @@ void SCTPChunkStatisticsDialog::fillTable(bool all, const sctp_assoc_info_t *sel continue; /* Get rid of the quotation marks */ QString ch = QString(token).mid(1, (int)strlen(token)-2); - g_strlcpy(id, qPrintable(ch), sizeof id); + (void) g_strlcpy(id, qPrintable(ch), sizeof id); if (!ws_strtoi32(id, NULL, &temp.id)) continue; temp.hide = 0; @@ -164,7 +164,7 @@ void SCTPChunkStatisticsDialog::fillTable(bool all, const sctp_assoc_info_t *sel temp.hide = 0; } else { QString ch2 = QString(token).mid(1, (int)strlen(token)-2); - g_strlcpy(temp.name, qPrintable(ch2), sizeof temp.name); + (void) g_strlcpy(temp.name, qPrintable(ch2), sizeof temp.name); } } } diff --git a/ui/summary.c b/ui/summary.c index 358f082746..038aee3768 100644 --- a/ui/summary.c +++ b/ui/summary.c @@ -212,9 +212,9 @@ summary_fill_in(capture_file *cf, summary_tally *st) } g_free(idb_info); - g_strlcpy(st->file_sha256, "<unknown>", HASH_STR_SIZE); - g_strlcpy(st->file_rmd160, "<unknown>", HASH_STR_SIZE); - g_strlcpy(st->file_sha1, "<unknown>", HASH_STR_SIZE); + (void) g_strlcpy(st->file_sha256, "<unknown>", HASH_STR_SIZE); + (void) g_strlcpy(st->file_rmd160, "<unknown>", HASH_STR_SIZE); + (void) g_strlcpy(st->file_sha1, "<unknown>", HASH_STR_SIZE); gcry_md_open(&hd, GCRY_MD_SHA256, 0); if (hd) { diff --git a/ui/tap-sctp-analysis.c b/ui/tap-sctp-analysis.c index 1c17bf2fb7..8f71bba1b5 100644 --- a/ui/tap-sctp-analysis.c +++ b/ui/tap-sctp-analysis.c @@ -194,7 +194,7 @@ calc_checksum(const struct _sctp_info *check_data, sctp_assoc_info_t *data) if ((float)(data->n_adler32_correct*1.0/data->n_adler32_calculated) > 0.5) { char str[] = "ADLER32"; - g_strlcpy(data->checksum_type, str, strlen(str)); + (void) g_strlcpy(data->checksum_type, str, strlen(str)); data->n_checksum_errors=(data->n_adler32_calculated-data->n_adler32_correct); ok = TRUE; } @@ -205,7 +205,7 @@ calc_checksum(const struct _sctp_info *check_data, sctp_assoc_info_t *data) if ((float)(data->n_crc32c_correct*1.0/data->n_crc32c_calculated) > 0.5) { char str[] = "CRC32C"; - g_strlcpy(data->checksum_type, str, strlen(str)); + (void) g_strlcpy(data->checksum_type, str, strlen(str)); data->n_checksum_errors=data->n_crc32c_calculated-data->n_crc32c_correct; ok = TRUE; } @@ -214,7 +214,7 @@ calc_checksum(const struct _sctp_info *check_data, sctp_assoc_info_t *data) if (!ok) { char str[] = "UNKNOWN"; - g_strlcpy(data->checksum_type, str, strlen(str)); + (void) g_strlcpy(data->checksum_type, str, strlen(str)); data->n_checksum_errors=0; } @@ -743,7 +743,7 @@ packet(void *tapdata _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const voi if ((tvb_get_guint8(sctp_info->tvb[0],0)) == SCTP_INIT_CHUNK_ID) { tmp_str = val_to_str_wmem(NULL, tvb_get_guint8(sctp_info->tvb[0],0),chunk_type_values,"Reserved (%d)"); - g_strlcpy(error->chunk_info, tmp_str, 200); + (void) g_strlcpy(error->chunk_info, tmp_str, 200); wmem_free(NULL, tmp_str); } else @@ -751,7 +751,7 @@ packet(void *tapdata _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const voi for (chunk_number = 0; chunk_number < sctp_info->number_of_tvbs; chunk_number++) { tmp_str = val_to_str_wmem(NULL, tvb_get_guint8(sctp_info->tvb[chunk_number],0),chunk_type_values,"Reserved (%d)"); - g_strlcat(error->chunk_info, tmp_str, 200); + (void) g_strlcat(error->chunk_info, tmp_str, 200); wmem_free(NULL, tmp_str); } } diff --git a/ui/text_import.c b/ui/text_import.c index e3b7bb139a..ab31ce9387 100644 --- a/ui/text_import.c +++ b/ui/text_import.c @@ -669,12 +669,12 @@ append_to_preamble(char *str) if (toklen != 0) { if (packet_preamble_len + toklen > PACKET_PREAMBLE_MAX_LEN) return; /* no room to add the token to the preamble */ - g_strlcpy(&packet_preamble[packet_preamble_len], str, PACKET_PREAMBLE_MAX_LEN); + (void) g_strlcpy(&packet_preamble[packet_preamble_len], str, PACKET_PREAMBLE_MAX_LEN); packet_preamble_len += (int) toklen; if (debug >= 2) { char *c; char xs[PACKET_PREAMBLE_MAX_LEN]; - g_strlcpy(xs, packet_preamble, PACKET_PREAMBLE_MAX_LEN); + (void) g_strlcpy(xs, packet_preamble, PACKET_PREAMBLE_MAX_LEN); while ((c = strchr(xs, '\r')) != NULL) *c=' '; fprintf (stderr, "[[append_to_preamble: \"%s\"]]", xs); } @@ -941,8 +941,8 @@ static void _parse_time(const guchar* start_field, const guchar* end_field, cons char *p; int i; - g_strlcpy(field, start_field, MIN(end_field - start_field + 1, PARSE_BUF)); - g_strlcpy(format, _format, PARSE_BUF); + (void) g_strlcpy(field, start_field, MIN(end_field - start_field + 1, PARSE_BUF)); + (void) g_strlcpy(format, _format, PARSE_BUF); /* * Initialize to today localtime, just in case not all fields @@ -1017,7 +1017,7 @@ void parse_time(const guchar* start_field, const guchar* end_field, const gchar* void parse_seqno(const guchar* start_field, const guchar* end_field) { char* buf = (char*) g_alloca(end_field - start_field + 1); - g_strlcpy(buf, start_field, end_field - start_field + 1); + (void) g_strlcpy(buf, start_field, end_field - start_field + 1); seqno = g_ascii_strtoull(buf, NULL, 10); } @@ -67,11 +67,11 @@ get_args_as_string(int argc, char **argv, int optindex) argstring[0] = '\0'; i = optindex; for (;;) { - g_strlcat(argstring, argv[i], len); + (void) g_strlcat(argstring, argv[i], len); i++; if (i == argc) break; - g_strlcat(argstring, " ", len); + (void) g_strlcat(argstring, " ", len); } return argstring; } diff --git a/wiretap/ascend_parser.lemon b/wiretap/ascend_parser.lemon index be1291c925..23b4ac09df 100644 --- a/wiretap/ascend_parser.lemon +++ b/wiretap/ascend_parser.lemon @@ -353,7 +353,7 @@ wdd_date ::= WDD_DATE wdd_decnum(MONTH) wdd_decnum(MDAY) wdd_decnum(YEAR) WDD_TI parser_state->timestamp = (guint32) mktime(&wddt); parser_state->saw_timestamp = TRUE; - g_strlcpy(parser_state->pseudo_header->call_num, CN_T.str_val, ASCEND_MAX_STR_LEN); + (void) g_strlcpy(parser_state->pseudo_header->call_num, CN_T.str_val, ASCEND_MAX_STR_LEN); } /* diff --git a/wiretap/ascend_scanner.l b/wiretap/ascend_scanner.l index 5058980849..478e845fc4 100644 --- a/wiretap/ascend_scanner.l +++ b/wiretap/ascend_scanner.l @@ -235,12 +235,12 @@ WDD_TYPE "type "[^\n\r\t ]+ if (after != '(' && after != ' ') { BEGIN(sc_wds_sess); if (yyextra->pseudo_header != NULL && yyextra->pseudo_header->user[0] == '\0') { - g_strlcpy(yyextra->pseudo_header->user, atcopy, ASCEND_MAX_STR_LEN); + (void) g_strlcpy(yyextra->pseudo_header->user, atcopy, ASCEND_MAX_STR_LEN); } } else { /* We have a version 7 file */ BEGIN(sc_gen_task); if (yyextra->pseudo_header != NULL && yyextra->pseudo_header->user[0] == '\0') { - g_strlcpy(yyextra->pseudo_header->user, NO_USER, ASCEND_MAX_STR_LEN); + (void) g_strlcpy(yyextra->pseudo_header->user, NO_USER, ASCEND_MAX_STR_LEN); } /* Are valid values ever > 2^32? If so we need to adjust YYSTYPE and a lot of */ /* upstream code accordingly. */ @@ -368,7 +368,7 @@ WDD_TYPE "type "[^\n\r\t ]+ <sc_wdd_callnum>{WDD_CALLNUM} { BEGIN(sc_wdd_chunk); - g_strlcpy(yyextra->token.str_val, yytext, ASCEND_MAX_STR_LEN); + (void) g_strlcpy(yyextra->token.str_val, yytext, ASCEND_MAX_STR_LEN); return WDD_CALLNUM; } diff --git a/wiretap/catapult_dct2000.c b/wiretap/catapult_dct2000.c index 0f5ccf0bf3..d285da46a4 100644 --- a/wiretap/catapult_dct2000.c +++ b/wiretap/catapult_dct2000.c @@ -204,7 +204,7 @@ catapult_dct2000_open(wtap *wth, int *err, gchar **err_info) file_externals = g_new0(dct2000_file_externals_t, 1); /* Copy this first line into buffer so could write out later */ - g_strlcpy(file_externals->firstline, linebuff, firstline_length+1); + (void) g_strlcpy(file_externals->firstline, linebuff, firstline_length+1); file_externals->firstline_length = firstline_length; @@ -235,7 +235,7 @@ catapult_dct2000_open(wtap *wth, int *err, gchar **err_info) file_externals->start_usecs = usecs; /* Copy this second line into buffer so could write out later */ - g_strlcpy(file_externals->secondline, linebuff, file_externals->secondline_length+1); + (void) g_strlcpy(file_externals->secondline, linebuff, file_externals->secondline_length+1); /************************************************************/ @@ -845,7 +845,7 @@ parse_line(gchar *linebuff, gint line_length, } /* There is no variant, outhdr, etc. Set protocol to be a comment */ - g_strlcpy(protocol_name, "comment", MAX_PROTOCOL_NAME); + (void) g_strlcpy(protocol_name, "comment", MAX_PROTOCOL_NAME); *is_comment = TRUE; break; } @@ -1227,7 +1227,7 @@ parse_line(gchar *linebuff, gint line_length, if (*is_comment) { if (strncmp(linebuff+n, "l $", 3) != 0) { *is_sprint = TRUE; - g_strlcpy(protocol_name, "sprint", MAX_PROTOCOL_NAME); + (void) g_strlcpy(protocol_name, "sprint", MAX_PROTOCOL_NAME); } } diff --git a/wiretap/cosine.c b/wiretap/cosine.c index 130a7c9a1c..18ecddd293 100644 --- a/wiretap/cosine.c +++ b/wiretap/cosine.c @@ -203,7 +203,7 @@ static gint64 cosine_seek_next_packet(wtap *wth, int *err, gchar **err_info, } if (strstr(buf, COSINE_REC_MAGIC_STR1) || strstr(buf, COSINE_REC_MAGIC_STR2)) { - g_strlcpy(hdr, buf, COSINE_LINE_LENGTH); + (void) g_strlcpy(hdr, buf, COSINE_LINE_LENGTH); return cur_off; } } @@ -421,7 +421,7 @@ parse_cosine_packet(FILE_T fh, wtap_rec *rec, Buffer *buf, } else if (strncmp(direction, "l2-rx", 5) == 0) { pseudo_header->cosine.direction = COSINE_DIR_RX; } - g_strlcpy(pseudo_header->cosine.if_name, if_name, + (void) g_strlcpy(pseudo_header->cosine.if_name, if_name, COSINE_MAX_IF_NAME_LEN); pseudo_header->cosine.pro = pro; pseudo_header->cosine.off = off; diff --git a/wiretap/file_access.c b/wiretap/file_access.c index bce398dc5b..94842626c2 100644 --- a/wiretap/file_access.c +++ b/wiretap/file_access.c @@ -2392,7 +2392,7 @@ wtap_dump_open_tempfile(char **filenamep, const char *pfx, ext = "tmp"; sfx[0] = '.'; sfx[1] = '\0'; - g_strlcat(sfx, ext, 16); + (void) g_strlcat(sfx, ext, 16); /* Choose a random name for the file */ fd = create_tempfile(filenamep, pfx, sfx, NULL); diff --git a/wiretap/log3gpp.c b/wiretap/log3gpp.c index a23bb9039a..fa8bb2cdc2 100644 --- a/wiretap/log3gpp.c +++ b/wiretap/log3gpp.c @@ -751,11 +751,11 @@ int write_stub_header(guchar *frame_buffer, char *timestamp_string, int stub_offset = 0; /* Timestamp within file */ - g_strlcpy((char*)&frame_buffer[stub_offset], timestamp_string, MAX_TIMESTAMP_LEN+1); + (void) g_strlcpy((char*)&frame_buffer[stub_offset], timestamp_string, MAX_TIMESTAMP_LEN+1); stub_offset += (int)(strlen(timestamp_string) + 1); /* Protocol name */ - g_strlcpy((char*)&frame_buffer[stub_offset], protocol_name, MAX_PROTOCOL_NAME+1); + (void) g_strlcpy((char*)&frame_buffer[stub_offset], protocol_name, MAX_PROTOCOL_NAME+1); stub_offset += (int)(strlen(protocol_name) + 1); /* Direction */ @@ -763,7 +763,7 @@ int write_stub_header(guchar *frame_buffer, char *timestamp_string, stub_offset++; /* Option string (might be string of length 0) */ - g_strlcpy((char*)&frame_buffer[stub_offset], protocol_parameters,MAX_PROTOCOL_PAR_STRING+1); + (void) g_strlcpy((char*)&frame_buffer[stub_offset], protocol_parameters,MAX_PROTOCOL_PAR_STRING+1); stub_offset += (int)(strlen(protocol_parameters) + 1); return stub_offset; } diff --git a/wiretap/logcat_text.c b/wiretap/logcat_text.c index 639396b28a..41359166eb 100644 --- a/wiretap/logcat_text.c +++ b/wiretap/logcat_text.c @@ -208,7 +208,7 @@ static gboolean logcat_text_read_packet(FILE_T fh, wtap_rec *rec, file_off = file_tell(fh); ret2 = file_gets(lbuff,WTAP_MAX_PACKET_SIZE_STANDARD, fh); while (NULL != ret2 && 2 < strlen(lbuff) && !file_eof(fh)) { - g_strlcat(cbuff,lbuff,WTAP_MAX_PACKET_SIZE_STANDARD); + (void) g_strlcat(cbuff,lbuff,WTAP_MAX_PACKET_SIZE_STANDARD); file_off = file_tell(fh); ret2 = file_gets(lbuff,WTAP_MAX_PACKET_SIZE_STANDARD, fh); } diff --git a/wiretap/netscaler.c b/wiretap/netscaler.c index d1490fe193..366ccfc5ab 100644 --- a/wiretap/netscaler.c +++ b/wiretap/netscaler.c @@ -2129,7 +2129,7 @@ static gboolean nstrace_add_signature(wtap_dumper *wdh, int *err) val16b = GUINT16_TO_LE(nspr_signature_v10_s); memcpy(sig10.phd.ph_RecordSize, &val16b, sizeof sig10.phd.ph_RecordSize); memset(sig10.sig_Signature, 0, NSPR_SIGSIZE_V10); - g_strlcpy(sig10.sig_Signature, NSPR_SIGSTR_V10, NSPR_SIGSIZE_V10); + (void) g_strlcpy(sig10.sig_Signature, NSPR_SIGSTR_V10, NSPR_SIGSIZE_V10); /* Write the record into the file */ if (!wtap_dump_file_write(wdh, &sig10, nspr_signature_v10_s, diff --git a/wiretap/netscreen.c b/wiretap/netscreen.c index 747c3064b4..18fcf10f5f 100644 --- a/wiretap/netscreen.c +++ b/wiretap/netscreen.c @@ -106,7 +106,7 @@ static gint64 netscreen_seek_next_packet(wtap *wth, int *err, gchar **err_info, } if (strstr(buf, NETSCREEN_REC_MAGIC_STR1) || strstr(buf, NETSCREEN_REC_MAGIC_STR2)) { - g_strlcpy(hdr, buf, NETSCREEN_LINE_LENGTH); + (void) g_strlcpy(hdr, buf, NETSCREEN_LINE_LENGTH); return cur_off; } } diff --git a/wiretap/nettl.c b/wiretap/nettl.c index 044f40b85a..0e0d21a24c 100644 --- a/wiretap/nettl.c +++ b/wiretap/nettl.c @@ -656,12 +656,12 @@ static gboolean nettl_dump_open(wtap_dumper *wdh, int *err, gchar **err_info _U_ /* Write the file header. */ memset(&file_hdr,0,sizeof(file_hdr)); memcpy(file_hdr.magic,nettl_magic_hpux10,sizeof(file_hdr.magic)); - g_strlcpy(file_hdr.file_name,"/tmp/wireshark.TRC000",NETTL_FILENAME_SIZE); - g_strlcpy(file_hdr.tz,"UTC",20); - g_strlcpy(file_hdr.host_name,"",9); - g_strlcpy(file_hdr.os_vers,"B.11.11",9); + (void) g_strlcpy(file_hdr.file_name,"/tmp/wireshark.TRC000",NETTL_FILENAME_SIZE); + (void) g_strlcpy(file_hdr.tz,"UTC",20); + (void) g_strlcpy(file_hdr.host_name,"",9); + (void) g_strlcpy(file_hdr.os_vers,"B.11.11",9); file_hdr.os_v=0x55; - g_strlcpy(file_hdr.model,"9000/800",11); + (void) g_strlcpy(file_hdr.model,"9000/800",11); file_hdr.unknown=g_htons(0x406); if (!wtap_dump_file_write(wdh, &file_hdr, sizeof file_hdr, err)) return FALSE; diff --git a/wiretap/nettrace_3gpp_32_423.c b/wiretap/nettrace_3gpp_32_423.c index 23c0276674..a230c1e2a9 100644 --- a/wiretap/nettrace_3gpp_32_423.c +++ b/wiretap/nettrace_3gpp_32_423.c @@ -146,7 +146,7 @@ nettrace_parse_address(char* curr_pos, char* next_pos, gboolean is_src_addr, exp curr_pos = skip_pos; - g_strlcpy(str, curr_pos, 3); + (void) g_strlcpy(str, curr_pos, 3); /* If we find "" here we have no IP address */ if (strcmp(str, "\"\"") == 0) { return next_pos; @@ -168,7 +168,7 @@ nettrace_parse_address(char* curr_pos, char* next_pos, gboolean is_src_addr, exp if (str_len > WS_INET6_ADDRSTRLEN) { return next_pos; } - g_strlcpy(ip_addr_str, curr_pos, str_len); + (void) g_strlcpy(ip_addr_str, curr_pos, str_len); curr_pos = end_pos; if (ws_inet_pton6(ip_addr_str, &ip6_addr)) { if (is_src_addr) { @@ -332,7 +332,7 @@ nettrace_msg_to_packet(nettrace_3gpp_32_423_file_info_t *file_info, wtap_rec *re goto end; } - g_strlcpy(name_str, curr_pos, (gsize)name_str_len + 1); + (void) g_strlcpy(name_str, curr_pos, (gsize)name_str_len + 1); ascii_strdown_inplace(name_str); } @@ -392,7 +392,7 @@ nettrace_msg_to_packet(nettrace_3gpp_32_423_file_info_t *file_info, wtap_rec *re status = FALSE; goto end; } - g_strlcpy(proto_name_str, curr_pos, (gsize)proto_str_len+1); + (void) g_strlcpy(proto_name_str, curr_pos, (gsize)proto_str_len+1); ascii_strdown_inplace(proto_name_str); /* Do string matching and replace with Wiresharks protocol name */ @@ -404,7 +404,7 @@ nettrace_msg_to_packet(nettrace_3gpp_32_423_file_info_t *file_info, wtap_rec *re /* XXX Do we need to check for function="S1"? */ if (strcmp(proto_name_str, "nas") == 0) { /* Change to nas-eps_plain */ - g_strlcpy(proto_name_str, c_nas_eps, sizeof(c_nas_eps)); + (void) g_strlcpy(proto_name_str, c_nas_eps, sizeof(c_nas_eps)); proto_str_len = CLEN(c_nas_eps); } if (strcmp(proto_name_str, "map") == 0) { @@ -415,14 +415,14 @@ nettrace_msg_to_packet(nettrace_3gpp_32_423_file_info_t *file_info, wtap_rec *re if (strcmp(name_str, "sai_request") == 0) { use_proto_table = TRUE; - g_strlcpy(dissector_table_str, c_sai_req, sizeof(c_sai_req)); + (void) g_strlcpy(dissector_table_str, c_sai_req, sizeof(c_sai_req)); dissector_table_str_len = CLEN(c_sai_req); dissector_table_val = 56; exported_pdu_info.presence_flags |= EXP_PDU_TAG_COL_PROT_BIT; } else if (strcmp(name_str, "sai_response") == 0) { use_proto_table = TRUE; - g_strlcpy(dissector_table_str, c_sai_rsp, sizeof(c_sai_rsp)); + (void) g_strlcpy(dissector_table_str, c_sai_rsp, sizeof(c_sai_rsp)); dissector_table_str_len = CLEN(c_sai_rsp); dissector_table_val = 56; exported_pdu_info.presence_flags |= EXP_PDU_TAG_COL_PROT_BIT; diff --git a/wiretap/observer.c b/wiretap/observer.c index 686bcc61b8..91a80af93e 100644 --- a/wiretap/observer.c +++ b/wiretap/observer.c @@ -720,7 +720,7 @@ static gboolean observer_dump_open(wtap_dumper *wdh, int *err, /* initialize the file header */ memset(&file_header, 0x00, sizeof(file_header)); - g_strlcpy(file_header.observer_version, observer_magic, 31); + (void) g_strlcpy(file_header.observer_version, observer_magic, 31); header_offset = (guint16)sizeof(file_header); /* create the file comment TLV */ diff --git a/wiretap/visual.c b/wiretap/visual.c index aa934cdb8e..8b6035f54d 100644 --- a/wiretap/visual.c +++ b/wiretap/visual.c @@ -808,7 +808,7 @@ static gboolean visual_dump_finish(wtap_dumper *wdh, int *err, vfile_hdr.max_length = GUINT16_TO_LE(65535); vfile_hdr.file_flags = GUINT16_TO_LE(1); /* indexes are present */ vfile_hdr.file_version = GUINT16_TO_LE(1); - g_strlcpy(vfile_hdr.description, "Wireshark file", 64); + (void) g_strlcpy(vfile_hdr.description, "Wireshark file", 64); /* Translate the encapsulation type */ switch (wdh->encap) diff --git a/wiretap/vms.c b/wiretap/vms.c index 44697bc83a..5887d0e0f3 100644 --- a/wiretap/vms.c +++ b/wiretap/vms.c @@ -163,7 +163,7 @@ static long vms_seek_next_packet(wtap *wth, int *err, gchar **err_info) if (strstr(buf, VMS_REC_MAGIC_STR1) || strstr(buf, VMS_REC_MAGIC_STR2) || strstr(buf, VMS_REC_MAGIC_STR2)) { - g_strlcpy(hdr, buf,VMS_LINE_LENGTH); + (void) g_strlcpy(hdr, buf,VMS_LINE_LENGTH); return cur_off; } } diff --git a/wsutil/filesystem.c b/wsutil/filesystem.c index 726e8d8467..33a14e0ac3 100644 --- a/wsutil/filesystem.c +++ b/wsutil/filesystem.c @@ -632,8 +632,8 @@ init_progfile_dir( path = (char *)g_malloc(path_len); memcpy(path, path_start, path_component_len); path[path_component_len] = '\0'; - g_strlcat(path, "/", path_len); - g_strlcat(path, execname, path_len); + (void) g_strlcat(path, "/", path_len); + (void) g_strlcat(path, execname, path_len); if (access(path, X_OK) == 0) { /* * Found it! diff --git a/wsutil/inet_addr.c b/wsutil/inet_addr.c index e4893d07bd..61f5f7f82f 100644 --- a/wsutil/inet_addr.c +++ b/wsutil/inet_addr.c @@ -80,7 +80,7 @@ _inet_ntop(int af, gconstpointer src, gchar *dst, guint dst_size) break; } /* set result to something that can't be confused with a valid conversion */ - g_strlcpy(dst, errmsg, dst_size); + (void) g_strlcpy(dst, errmsg, dst_size); /* set errno for caller */ errno = saved_errno; } |