Skip to content

Commit 4984a48

Browse files
committed
Use named constants to enable/disable/toggle warnings, instead of hardcoded values
1 parent 362d298 commit 4984a48

File tree

4 files changed

+15
-9
lines changed

4 files changed

+15
-9
lines changed

source/compiler/sc.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,6 +539,12 @@ typedef enum s_optmark {
539539

540540
#define MAX_INSTR_LEN 30
541541

542+
typedef enum s_warnmode {
543+
warnDISABLE,
544+
warnENABLE,
545+
warnTOGGLE
546+
} warnmode;
547+
542548
#define eotNUMBER 0
543549
#define eotFUNCTION 1
544550
#define eotLABEL 2
@@ -607,7 +613,7 @@ enum { /* attribute flags for "__pragma" */
607613
int pc_compile(int argc, char **argv);
608614
int pc_addconstant(char *name,cell value,int tag);
609615
int pc_addtag(char *name);
610-
int pc_enablewarning(int number,int enable);
616+
int pc_enablewarning(int number,warnmode enable);
611617
int pc_pushwarnings();
612618
int pc_popwarnings();
613619
void pc_seterrorwarnings(int enable);

source/compiler/sc1.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1212,11 +1212,11 @@ static void parseoptions(int argc,char **argv,char *oname,char *ename,char *pnam
12121212
case 'w':
12131213
i=(int)strtol(option_value(ptr),(char **)&ptr,10);
12141214
if (*ptr=='-')
1215-
pc_enablewarning(i,0);
1215+
pc_enablewarning(i,warnDISABLE);
12161216
else if (*ptr=='+')
1217-
pc_enablewarning(i,1);
1217+
pc_enablewarning(i,warnENABLE);
12181218
else if (*ptr=='\0')
1219-
pc_enablewarning(i,2);
1219+
pc_enablewarning(i,warnTOGGLE);
12201220
break;
12211221
case 'X':
12221222
if (*(ptr+1)=='D') {

source/compiler/sc2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1309,7 +1309,7 @@ static int command(void)
13091309
cell val;
13101310
do {
13111311
preproc_expr(&val,NULL);
1312-
pc_enablewarning(val,(str[0]=='e') ? 1 : 0);
1312+
pc_enablewarning(val,(str[0]=='e') ? warnENABLE : warnDISABLE);
13131313
} while (*lptr!='\0');
13141314
} else if (strcmp(str,"push")==0) {
13151315
pc_pushwarnings();

source/compiler/sc5.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ SC_FUNC void errorset(int code,int line)
385385
* o 1 for enable
386386
* o 2 for toggle
387387
*/
388-
int pc_enablewarning(int number,int enable)
388+
int pc_enablewarning(int number,warnmode enable)
389389
{
390390
int index;
391391
unsigned char mask;
@@ -399,13 +399,13 @@ int pc_enablewarning(int number,int enable)
399399
index=number/8;
400400
mask=(unsigned char)(1 << (number%8));
401401
switch (enable) {
402-
case 0:
402+
case warnDISABLE:
403403
warnstack.disable[index] |= mask;
404404
break;
405-
case 1:
405+
case warnENABLE:
406406
warnstack.disable[index] &= (unsigned char)~mask;
407407
break;
408-
case 2:
408+
case warnTOGGLE:
409409
warnstack.disable[index] ^= mask;
410410
break;
411411
} /* switch */

0 commit comments

Comments
 (0)