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

[project @ 2004-12-09 19:09:56 by rjw] 

Lose xcalloc().

svn path=/import/netsurf/; revision=1397
This commit is contained in:
Richard Wilson 2004-12-09 19:09:56 +00:00
parent bd652a750a
commit 441b364600
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
riscos/filetype.c
View File

@ -49,11 +49,16 @@ const char *fetch_filetype(const char *unix_path)
{
struct type_entry *t;
unsigned int len = strlen(unix_path) + 100;
char *path = xcalloc(len, 1);
char *path = calloc(len, 1);
char *r;
os_error *error;
bits file_type;
if (!path) {
LOG(("Insuficient memory for calloc"));
warn_user("NoMemory", 0);
return "application/riscos";
}
LOG(("unix_path = '%s'", unix_path));
/* convert path to RISC OS format and read file type */
@ -84,7 +89,13 @@ char *fetch_mimetype(const char *ro_path) {
os_error *e;
bits filetype = 0, load;
int objtype;
char *mime = xcalloc(256, sizeof(char));
char *mime = calloc(256, sizeof(char));
if (!mime) {
LOG(("Insuficient memory for calloc"));
warn_user("NoMemory", 0);
return 0;
}
e = xosfile_read_no_path(ro_path, &objtype, &load, 0, 0, 0);
if (e) return 0;

2
riscos/uri.c
View File

@ -48,7 +48,7 @@ void ro_uri_message_received(uri_full_message_process* uri_message)
uri_message->sender);
xuri_request_uri(0, 0, 0, uri_handle, &uri_length);
uri_requested = xcalloc((unsigned int)uri_length, sizeof(char));
uri_requested = calloc((unsigned int)uri_length, sizeof(char));
if (uri_requested == NULL)
return;