Skip to content

Commit 809abcd

Browse files
committed
Fix -Wswitch and -Wparentheses warnings in gpre/cmp
+ misc other fixes
1 parent 79b64ec commit 809abcd

File tree

1 file changed

+17
-2
lines changed

1 file changed

+17
-2
lines changed

src/gpre/cmp.cpp

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ static ULONG next_ident;
8484
//#define STUFF_LONG(blr) {STUFF (blr); STUFF ((blr) >> 8); STUFF ((blr) >>16); STUFF ((blr) >> 24);}
8585
//#define STUFF_INT(blr) STUFF (blr); STUFF ((blr) >> 8); STUFF ((blr) >> 16); STUFF ((blr) >> 24)
8686

87-
const int MAX_TPB = 4000;
87+
constexpr int MAX_TPB = 4000;
8888

8989
//____________________________________________________________
9090
//
@@ -185,6 +185,9 @@ void CMP_compile_request( gpre_req* request)
185185
case REQ_procedure:
186186
cmp_procedure(request);
187187
return;
188+
189+
default:
190+
break;
188191
}
189192
// expand any incomplete references or values
190193

@@ -274,6 +277,9 @@ void CMP_compile_request( gpre_req* request)
274277
case ACT_insert:
275278
cmp_fetch(action);
276279
break;
280+
default:
281+
// action not "interesting"
282+
break;
277283
}
278284
}
279285

@@ -385,7 +391,9 @@ void CMP_stuff_symbol( gpre_req* request, const gpre_sym* symbol)
385391
void CMP_t_start( gpre_tra* trans)
386392
{
387393
char rrl_buffer[MAX_TPB];
394+
rrl_buffer[0] = 0;
388395
char tpb_buffer[MAX_TRA_OPTIONS + 1];
396+
tpb_buffer[0] = 0;
389397

390398
// fill out a standard tpb buffer ahead of time so we know
391399
// how large it is
@@ -908,6 +916,8 @@ static void cmp_for( gpre_req* request)
908916
case ACT_erase:
909917
updates = true;
910918
break;
919+
default:
920+
break;
911921
}
912922
}
913923

@@ -974,6 +984,8 @@ static void cmp_for( gpre_req* request)
974984
case ACT_erase:
975985
cmp_erase(action, request);
976986
break;
987+
default:
988+
break;
977989
}
978990
}
979991
request->add_byte(blr_end);
@@ -1401,6 +1413,9 @@ static void cmp_sdl_fudge( gpre_req* request, SLONG lower_bound)
14011413
request->add_byte(isc_sdl_add);
14021414
cmp_sdl_number(request, lower_bound - 1);
14031415
break;
1416+
1417+
default:
1418+
break;
14041419
}
14051420
}
14061421

@@ -1752,7 +1767,7 @@ static gpre_port* make_port( gpre_req* request, ref* reference)
17521767
}
17531768

17541769
for (int i = 0; i <= 2; i++)
1755-
while (reference = alignments[i])
1770+
while ((reference = alignments[i]))
17561771
{
17571772
alignments[i] = reference->ref_next;
17581773
reference->ref_next = misc;

0 commit comments

Comments
 (0)