int count = 0;
size_t size = 512;
- buf = calloc (1, size);
+ buf = xcalloc(1, size);
while (fgets(buf, size, fp)) {
while (strlen (buf) == (size - 1)
&& buf[size-2] != '\n') {
size_t o = size - 1;
size *= 2;
- buf = realloc (buf, size);
+ buf = xrealloc (buf, size);
if (fgets (buf + o, size - o, fp) == NULL)
break;
}
if(!(count % 50))
- raw = realloc(raw, (count + 50) * sizeof(char *));
+ raw = xrealloc(raw, (count + 50) * sizeof(char *));
if((scout = strchr(buf, '\n')))
*scout = '\0';
raw[count++] = xstrdup(buf);
}
- raw = realloc(raw, (count + 1) * sizeof(char *));
+ raw = xrealloc(raw, (count + 1) * sizeof(char *));
raw[count] = NULL;
free (buf);
}
/* something to remove whitespace, a hash pooper */
-char *trim_alloc(char *line)
+char *trim_alloc(const char *src)
{
- char *new;
- char *dest, *src, *end;
-
- new = calloc(1, strlen(line) + 1);
- if ( new == NULL ){
- fprintf(stderr,"%s: Unable to allocate memory\n",__FUNCTION__);
- return NULL;
- }
- dest = new, src = line, end = line + (strlen(line) - 1);
+ const char *end;
/* remove it from the front */
while(src &&
isspace(*src) &&
*src)
src++;
+
+ end = src + (strlen(src) - 1);
+
/* and now from the back */
while((end > src) &&
isspace(*end))
end--;
+
end++;
- *end = '\0';
- strcpy(new, src);
- /* this does from the first space
- * blasting away any versions stuff in depends
- while(src &&
- !isspace(*src) &&
- *src)
- *dest++ = *src++;
- *dest = '\0';
- */
-
- return new;
+
+ /* xstrndup will NULL terminate for us */
+ return xstrndup(src, end-src);
}
int line_is_blank(const char *line)
{
struct errlist *e;
- e = calloc(1, sizeof(struct errlist));
- if (e == NULL) {
- fprintf(stderr, "%s: calloc: %s\n",
- __FUNCTION__, strerror(errno));
- return;
- }
-
+ e = xcalloc(1, sizeof(struct errlist));
e->errmsg = xstrdup(msg);
e->next = NULL;