Commit 082f2596 authored by Martin Blix Grydeland's avatar Martin Blix Grydeland

Attempt to quell strange coverity report

Add extra variables of the right enum types in an attempt to quell a
coverity report about enum type missmatch when reusing the same
integer counter.
parent 20362bf8
...@@ -681,7 +681,9 @@ vtx_parse_link(const char *str, enum VSL_transaction_e *ptype, ...@@ -681,7 +681,9 @@ vtx_parse_link(const char *str, enum VSL_transaction_e *ptype,
{ {
char type[16], reason[16]; char type[16], reason[16];
unsigned vxid; unsigned vxid;
int i, j; int i;
enum VSL_transaction_e et;
enum VSL_reason_e er;
AN(str); AN(str);
AN(ptype); AN(ptype);
...@@ -691,26 +693,30 @@ vtx_parse_link(const char *str, enum VSL_transaction_e *ptype, ...@@ -691,26 +693,30 @@ vtx_parse_link(const char *str, enum VSL_transaction_e *ptype,
i = sscanf(str, "%15s %u %15s", type, &vxid, reason); i = sscanf(str, "%15s %u %15s", type, &vxid, reason);
if (i < 1) if (i < 1)
return (0); return (0);
for (j = 0; j < VSL_t__MAX; j++)
if (!strcmp(type, vsl_t_names[j])) /* transaction type */
for (et = 0; et < VSL_t__MAX; et++)
if (!strcmp(type, vsl_t_names[et]))
break; break;
if (j < VSL_t__MAX) if (et >= VSL_t__MAX)
*ptype = j; et = VSL_t_unknown;
else *ptype = et;
*ptype = VSL_t_unknown;
if (i == 1) if (i == 1)
return (1); return (1);
/* vxid */
assert((vxid & ~VSL_IDENTMASK) == 0); assert((vxid & ~VSL_IDENTMASK) == 0);
*pvxid = vxid; *pvxid = vxid;
if (i == 2) if (i == 2)
return (2); return (2);
for (j = 0; j < VSL_r__MAX; j++)
if (!strcmp(reason, vsl_r_names[j])) /* transaction reason */
for (er = 0; er < VSL_r__MAX; er++)
if (!strcmp(reason, vsl_r_names[er]))
break; break;
if (j < VSL_r__MAX) if (er >= VSL_r__MAX)
*preason = j; er = VSL_r_unknown;
else *preason = er;
*preason = VSL_r_unknown;
return (3); return (3);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment