114 |
|
lastp = lp; |
115 |
|
} |
116 |
|
fclose(fp); |
117 |
< |
return(1); |
117 |
> |
return(lastp != NULL); |
118 |
|
memerr: |
119 |
|
fputs("Out of memory in loadlamps\n", stderr); |
120 |
|
return(-1); |
129 |
|
{ |
130 |
|
register LAMP *lp1, *lp2; |
131 |
|
|
132 |
< |
for (lp1 = lamps; lp1 != NULL; lp1 = lp1->next) { |
132 |
> |
for (lp1 = lamps; lp1 != NULL; lp1 = lp2) { |
133 |
|
free(lp1->pattern); |
134 |
|
if (lp1->color != NULL) { |
135 |
|
for (lp2 = lp1->next; lp2 != NULL; lp2 = lp2->next) |
137 |
|
lp2->color = NULL; |
138 |
|
free((char *)lp1->color); |
139 |
|
} |
140 |
+ |
lp2 = lp1->next; |
141 |
|
free((char *)lp1); |
142 |
|
} |
143 |
|
lamps = NULL; |