luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

resis.h: create RESTRUE to replace use of TRUE macro ((bool)1) 

Looks to be used as integer bitmask which is flagged by compiler warning
as dubious, when using compiler provided type 'bool' from stdbool.h
in C99 instead of unsigned char type.

C29 bool type compatibility
This commit is contained in:
Darryl L. Miles 2025-01-06 17:28:55 +00:00 committed by Tim Edwards
parent 4887f71ca3
commit f010d4d20b
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
resis/ResMerge.c
View File

@ -53,7 +53,7 @@ ResDoneWithNode(resptr)
resResistor *rr1; resResistor *rr1;
resptr2 = NULL; resptr2 = NULL;
resptr->rn_status |= TRUE; resptr->rn_status |= RESTRUE;
status = UNTOUCHED; status = UNTOUCHED;
/* are there any resistors? */ /* are there any resistors? */
@ -93,9 +93,9 @@ ResDoneWithNode(resptr)
ResMergeNodes(resptr2, resptr, &ResNodeQueue, &ResNodeList); ResMergeNodes(resptr2, resptr, &ResNodeQueue, &ResNodeList);
resptr2->rn_float.rn_area += rr1->rr_float.rr_area; resptr2->rn_float.rn_area += rr1->rr_float.rr_area;
ResEliminateResistor(rr1, &ResResList); ResEliminateResistor(rr1, &ResResList);
if ((resptr2->rn_status & TRUE) == TRUE) if ((resptr2->rn_status & RESTRUE) == RESTRUE)
{ {
resptr2->rn_status &= ~TRUE; resptr2->rn_status &= ~RESTRUE;
ResDoneWithNode(resptr2); ResDoneWithNode(resptr2);
} }
resptr2 = NULL; resptr2 = NULL;
@ -253,9 +253,9 @@ ResSeriesCheck(resptr)
ResEliminateResistor(rr1, &ResResList); ResEliminateResistor(rr1, &ResResList);
ResCleanNode(resptr, TRUE, &ResNodeList, &ResNodeQueue); ResCleanNode(resptr, TRUE, &ResNodeList, &ResNodeQueue);
status = SINGLE; status = SINGLE;
if (resptr2->rn_status & TRUE) if (resptr2->rn_status & RESTRUE)
{ {
resptr2->rn_status &= ~TRUE; resptr2->rn_status &= ~RESTRUE;
ResDoneWithNode(resptr2); ResDoneWithNode(resptr2);
} }
resptr2 = NULL; resptr2 = NULL;
@ -291,9 +291,9 @@ ResSeriesCheck(resptr)
rr1->rr_connection1 = rr2->rr_connection2; rr1->rr_connection1 = rr2->rr_connection2;
ResFixRes(resptr, resptr2, resptr3, rr2, rr1); ResFixRes(resptr, resptr2, resptr3, rr2, rr1);
} }
if ((resptr2->rn_status & TRUE) == TRUE) if ((resptr2->rn_status & RESTRUE) == RESTRUE)
{ {
resptr2->rn_status &= ~TRUE; resptr2->rn_status &= ~RESTRUE;
ResDoneWithNode(resptr2); ResDoneWithNode(resptr2);
} }
resptr2 = NULL; resptr2 = NULL;
@ -322,9 +322,9 @@ ResSeriesCheck(resptr)
rr1->rr_connection1 = rr2->rr_connection1; rr1->rr_connection1 = rr2->rr_connection1;
ResFixRes(resptr, resptr2, resptr3, rr2, rr1); ResFixRes(resptr, resptr2, resptr3, rr2, rr1);
} }
if ((resptr2->rn_status & TRUE) == TRUE) if ((resptr2->rn_status & RESTRUE) == RESTRUE)
{ {
resptr2->rn_status &= ~TRUE; resptr2->rn_status &= ~RESTRUE;
ResDoneWithNode(resptr2); ResDoneWithNode(resptr2);
} }
resptr2 = NULL; resptr2 = NULL;
@ -356,9 +356,9 @@ ResSeriesCheck(resptr)
rr1->rr_connection2 = rr2->rr_connection2; rr1->rr_connection2 = rr2->rr_connection2;
ResFixRes(resptr, resptr2, resptr3, rr2, rr1); ResFixRes(resptr, resptr2, resptr3, rr2, rr1);
} }
if ((resptr2->rn_status & TRUE) == TRUE) if ((resptr2->rn_status & RESTRUE) == RESTRUE)
{ {
resptr2->rn_status &= ~TRUE; resptr2->rn_status &= ~RESTRUE;
ResDoneWithNode(resptr2); ResDoneWithNode(resptr2);
} }
resptr2 = NULL; resptr2 = NULL;
@ -387,9 +387,9 @@ ResSeriesCheck(resptr)
rr1->rr_connection2 = rr2->rr_connection1; rr1->rr_connection2 = rr2->rr_connection1;
ResFixRes(resptr, resptr2, resptr3, rr2, rr1); ResFixRes(resptr, resptr2, resptr3, rr2, rr1);
} }
if ((resptr2->rn_status & TRUE) == TRUE) if ((resptr2->rn_status & RESTRUE) == RESTRUE)
{ {
resptr2->rn_status &= ~TRUE; resptr2->rn_status &= ~RESTRUE;
ResDoneWithNode(resptr2); ResDoneWithNode(resptr2);
} }
resptr2 = NULL; resptr2 = NULL;
@ -444,10 +444,10 @@ ResParallelCheck(resptr)
ResFixParallel(r1, r2); ResFixParallel(r1, r2);
status = PARALLEL; status = PARALLEL;
resptr2 = NULL; resptr2 = NULL;
if (resptr3->rn_status & TRUE) if (resptr3->rn_status & RESTRUE)
{ {
resptr2 = resptr3; resptr2 = resptr3;
resptr2->rn_status &= ~TRUE; resptr2->rn_status &= ~RESTRUE;
} }
ResDoneWithNode(resptr); ResDoneWithNode(resptr);
if (resptr2 != NULL) ResDoneWithNode(resptr2); if (resptr2 != NULL) ResDoneWithNode(resptr2);
@ -543,7 +543,7 @@ ResTriangleCheck(resptr)
/* occupied by the first node. */ /* occupied by the first node. */
InitializeNode(n3, resptr->rn_loc.p_x, resptr->rn_loc.p_y, TRIANGLE); InitializeNode(n3, resptr->rn_loc.p_x, resptr->rn_loc.p_y, TRIANGLE);
n3->rn_status = FINISHED | TRUE | MARKED; n3->rn_status = FINISHED | RESTRUE | MARKED;
n3->rn_less = NULL; n3->rn_less = NULL;
n3->rn_more = ResNodeList; n3->rn_more = ResNodeList;
@ -591,13 +591,13 @@ ResTriangleCheck(resptr)
element->re_nextEl = n3->rn_re; element->re_nextEl = n3->rn_re;
element->re_thisEl = rr3; element->re_thisEl = rr3;
n3->rn_re = element; n3->rn_re = element;
if ((n1->rn_status & TRUE) == TRUE) if ((n1->rn_status & RESTRUE) == RESTRUE)
n1->rn_status &= ~TRUE; n1->rn_status &= ~RESTRUE;
else else
n1 = NULL; n1 = NULL;
if ((n2->rn_status & TRUE) == TRUE) if ((n2->rn_status & RESTRUE) == RESTRUE)
n2->rn_status &= ~TRUE; n2->rn_status &= ~RESTRUE;
else else
n2 = NULL; n2 = NULL;

1
resis/resis.h
View File

@ -511,6 +511,7 @@ typedef struct capval
#define SINGLE 8 #define SINGLE 8
#define TRIANGLE 32 #define TRIANGLE 32
#define RESTRUE 1
#define PENDING 2 #define PENDING 2
#define FINISHED 4 #define FINISHED 4