diff options
| -rw-r--r-- | utils/utils.c | 27 | ||||
| -rw-r--r-- | utils/utils.h | 1 |
2 files changed, 6 insertions, 22 deletions
diff --git a/utils/utils.c b/utils/utils.c index aa2494595..c65181511 100644 --- a/utils/utils.c +++ b/utils/utils.c @@ -79,26 +79,6 @@ char * xstrdup(const char * const s) return c; } -char * load(const char * const path) -{ - FILE * fp = fopen(path, "rb"); - char * buf; - long size, read; - - if (fp == 0) die("Failed to open file"); - if (fseek(fp, 0, SEEK_END) != 0) die("fseek() failed"); - if ((size = ftell(fp)) == -1) die("ftell() failed"); - buf = xcalloc((size_t) size, 1); - - if (fseek(fp, 0, SEEK_SET) != 0) die("fseek() failed"); - read = fread(buf, 1, (size_t) size, fp); - if (read < size) die("fread() failed"); - - fclose(fp); - - return buf; -} - char * squash_whitespace(const char * s) { char * c = malloc(strlen(s) + 1); @@ -330,7 +310,12 @@ void clean_cookiejar(void) { len = ftell(fp); fseek(fp, 0, SEEK_SET); - cookies = xcalloc((unsigned int)len, sizeof(char)); + cookies = calloc((unsigned int)len, sizeof(char)); + if ( NULL == cookies ) { + warn_user( "NoMemory", 0); + return; + } + fread(cookies, (unsigned int)len, sizeof(char), fp); fclose(fp); diff --git a/utils/utils.h b/utils/utils.h index b3e64609f..31ee01bf3 100644 --- a/utils/utils.h +++ b/utils/utils.h @@ -23,7 +23,6 @@ void * xcalloc(const size_t n, const size_t size); void * xrealloc(void * p, const size_t size); void xfree(void* p); char * xstrdup(const char * const s); -char * load(const char * const path); char * squash_whitespace(const char * s); char *cnv_space2nbsp(const char *s); char *cnv_local_enc_str(const char *s, size_t length); |