91 |
|
char **idmap; |
92 |
|
int idmlen; |
93 |
|
int nextID = 0; |
94 |
< |
LUTAB hashtab = LU_SINIT(free,NULL); |
94 |
> |
LUTAB hashtab; |
95 |
|
RESOLU rs; |
96 |
|
long n; |
97 |
|
int ndx; |
134 |
|
fputs(": unsupported bits/pixel\n", stderr); |
135 |
|
return 0; |
136 |
|
} |
137 |
+ |
memset(&hashtab, 0, sizeof(hashtab)); |
138 |
+ |
hashtab.hashf = lu_shash; |
139 |
+ |
hashtab.keycmp = strcmp; |
140 |
+ |
hashtab.freek = free; |
141 |
|
if (!idmap || !lu_init(&hashtab, idmlen)) |
142 |
|
goto memerr; |
143 |
|
fputc('\n', stdout); /* end of info header */ |
318 |
|
if (numeric) { |
319 |
|
printf("%d", ndx); |
320 |
|
} else { |
321 |
< |
const char *id = idmap_next(idmp); |
321 |
> |
const char *id = mapID(idmp, ndx); |
322 |
|
if (!id) { |
323 |
|
fputs(fname, stderr); |
324 |
|
fputs(": bad ID index in file\n", stderr); |