From: wmeier Date: Mon, 4 Apr 2011 15:31:33 +0000 (+0000) Subject: Don't assign to a variable if the value won't be used: Coverity 817-821. X-Git-Url: http://git.samba.org/samba.git/?p=obnox%2Fwireshark%2Fwip.git;a=commitdiff_plain;h=1f2dfc0d8d294d3ed9db182a4f994c8c94f0c101 Don't assign to a variable if the value won't be used: Coverity 817-821. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36446 f5534014-38df-0310-8fa8-9805f1628bb7 --- diff --git a/dftest.c b/dftest.c index 5d82b6374b..c7ad6f363c 100644 --- a/dftest.c +++ b/dftest.c @@ -62,7 +62,6 @@ main(int argc, char **argv) char *gpf_path, *pf_path; int gpf_open_errno, gpf_read_errno; int pf_open_errno, pf_read_errno; - e_prefs *prefs_p; dfilter_t *df; /* @@ -98,7 +97,7 @@ main(int argc, char **argv) /* set the c-language locale to the native environment. */ setlocale(LC_ALL, ""); - prefs_p = read_prefs(&gpf_open_errno, &gpf_read_errno, &gpf_path, + read_prefs(&gpf_open_errno, &gpf_read_errno, &gpf_path, &pf_open_errno, &pf_read_errno, &pf_path); if (gpf_path != NULL) { if (gpf_open_errno != 0) { diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c index 89094a82fc..be5c5ec54f 100644 --- a/epan/addr_resolv.c +++ b/epan/addr_resolv.c @@ -506,7 +506,7 @@ parse_service_line (char *line) port = cp; - if ((cp = strtok(cp, "/")) == NULL) + if (strtok(cp, "/") == NULL) return; if ((cp = strtok(NULL, "/")) == NULL) diff --git a/epan/dfilter/gencode.c b/epan/dfilter/gencode.c index 7f140cbc49..0b6a5ad4cd 100644 --- a/epan/dfilter/gencode.c +++ b/epan/dfilter/gencode.c @@ -430,9 +430,9 @@ gen_test(dfwork_t *dfw, stnode_t *st_node) static void gencode(dfwork_t *dfw, stnode_t *st_node) { - const char *name; + /* const char *name; */ - name = stnode_type_name(st_node); + /* name = */stnode_type_name(st_node); /* XXX: is this being done just for the side-effect ? */ switch (stnode_type_id(st_node)) { case STTYPE_TEST: diff --git a/epan/dfilter/semcheck.c b/epan/dfilter/semcheck.c index 369aacf93c..01ae0c056a 100644 --- a/epan/dfilter/semcheck.c +++ b/epan/dfilter/semcheck.c @@ -957,7 +957,7 @@ check_relation_LHS_FUNCTION(const char *relation_string, FtypeCanFunc can_func, drange_node *rn; df_func_def_t *funcdef; df_func_def_t *funcdef2; - GSList *params; + /* GSList *params; */ check_function(st_arg1); type2 = stnode_type_id(st_arg2); @@ -965,7 +965,7 @@ check_relation_LHS_FUNCTION(const char *relation_string, FtypeCanFunc can_func, funcdef = sttype_function_funcdef(st_arg1); ftype1 = funcdef->retval_ftype; - params = sttype_function_params(st_arg1); + /* params = */sttype_function_params(st_arg1); /* XXX: is this done for the side-effect ? */ DebugLog((" 5 check_relation_LHS_FUNCTION(%s)\n", relation_string)); diff --git a/epan/dissectors/packet-infiniband_sdp.c b/epan/dissectors/packet-infiniband_sdp.c index 652ab5fc3a..b7443eeb75 100644 --- a/epan/dissectors/packet-infiniband_sdp.c +++ b/epan/dissectors/packet-infiniband_sdp.c @@ -277,7 +277,7 @@ manual_override: proto_tree_add_item(SDP_EH_header_tree, hf_ib_sdp_extmaxadverts, tvb, local_offset, 2, FALSE); local_offset += 2; break; case HelloAck: - SDP_EH_header_item = proto_tree_add_item(SDP_header_tree, hf_ib_sdp_hah, tvb, local_offset, 48, FALSE); + proto_tree_add_item(SDP_header_tree, hf_ib_sdp_hah, tvb, local_offset, 48, FALSE); break; case DisConn: break; @@ -286,13 +286,13 @@ manual_override: case SendSm: break; case RdmaWrCompl: - SDP_EH_header_item = proto_tree_add_item(SDP_header_tree, hf_ib_sdp_rwch, tvb, local_offset, 48, FALSE); + proto_tree_add_item(SDP_header_tree, hf_ib_sdp_rwch, tvb, local_offset, 48, FALSE); break; case RdmaRdCompl: - SDP_EH_header_item = proto_tree_add_item(SDP_header_tree, hf_ib_sdp_rrch, tvb, local_offset, 48, FALSE); + proto_tree_add_item(SDP_header_tree, hf_ib_sdp_rrch, tvb, local_offset, 48, FALSE); break; case ModeChange: - SDP_EH_header_item = proto_tree_add_item(SDP_BSDH_header_tree, hf_ib_sdp_mch, tvb, local_offset, 48, FALSE); + proto_tree_add_item(SDP_BSDH_header_tree, hf_ib_sdp_mch, tvb, local_offset, 48, FALSE); break; case SrcAvailCancel: break; @@ -301,24 +301,24 @@ manual_override: case SinkCancelAck: break; case ChRcvBuf: - SDP_EH_header_item = proto_tree_add_item(SDP_header_tree, hf_ib_sdp_crbh, tvb, local_offset, 48, FALSE); + proto_tree_add_item(SDP_header_tree, hf_ib_sdp_crbh, tvb, local_offset, 48, FALSE); break; case ChRcvBufAck: - SDP_EH_header_item = proto_tree_add_item(SDP_header_tree, hf_ib_sdp_crbah, tvb, local_offset, 48, FALSE); + proto_tree_add_item(SDP_header_tree, hf_ib_sdp_crbah, tvb, local_offset, 48, FALSE); break; case SuspComm: - SDP_EH_header_item = proto_tree_add_item(SDP_header_tree, hf_ib_sdp_suspch, tvb, local_offset, 48, FALSE); + proto_tree_add_item(SDP_header_tree, hf_ib_sdp_suspch, tvb, local_offset, 48, FALSE); break; case SuspCommAck: break; case SinkAvail: - SDP_EH_header_item = proto_tree_add_item(SDP_header_tree, hf_ib_sdp_sinkah, tvb, local_offset, 48, FALSE); + proto_tree_add_item(SDP_header_tree, hf_ib_sdp_sinkah, tvb, local_offset, 48, FALSE); break; case SrcAvail: - SDP_EH_header_item = proto_tree_add_item(SDP_header_tree, hf_ib_sdp_srcah, tvb, local_offset, 48, FALSE); + proto_tree_add_item(SDP_header_tree, hf_ib_sdp_srcah, tvb, local_offset, 48, FALSE); break; case Data: - SDP_EH_header_item = proto_tree_add_item(SDP_header_tree, hf_ib_sdp_data, tvb, local_offset, -1, FALSE); + proto_tree_add_item(SDP_header_tree, hf_ib_sdp_data, tvb, local_offset, -1, FALSE); break; default: break;