mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[project @ 2004-12-08 00:10:17 by kevinb] 

Removed unused function load, and altered call to xcalloc into a call to calloc in clean_cookiejar

svn path=/import/netsurf/; revision=1389
This commit is contained in:
Kevin Bagust 2004-12-08 00:10:17 +00:00
parent e3ca55d7cc
commit e11c05d257
2 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
utils/utils.c
View File

@ -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);

1
utils/utils.h
View File

@ -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);