Alexander/nsxiv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prefix safe allocation functions with 'e' instead of 's_'

Browse Source
This commit is contained in:
Bert Münnich
2015-10-28 22:29:01 +01:00
parent b096cbd536
commit 851e4288c1
6 changed files with 34 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
thumbs.c
View File

@@ -48,7 +48,7 @@ char* tns_cache_filepath(const char *filepath)
if (strncmp(filepath, cache_dir, strlen(cache_dir)) != 0) {
/* don't cache images inside the cache directory! */
len = strlen(cache_dir) + strlen(filepath) + 2;
cfile = (char*) s_malloc(len);
cfile = (char*) emalloc(len);
snprintf(cfile, len, "%s/%s", cache_dir, filepath + 1);
}
return cfile;
@@ -155,7 +155,7 @@ void tns_init(tns_t *tns, fileinfo_t *files, const int *cnt, int *sel,
const char *homedir, *dsuffix = "";
if (cnt != NULL && *cnt > 0) {
tns->thumbs = (thumb_t*) s_malloc(*cnt * sizeof(thumb_t));
tns->thumbs = (thumb_t*) emalloc(*cnt * sizeof(thumb_t));
memset(tns->thumbs, 0, *cnt * sizeof(thumb_t));
} else {
tns->thumbs = NULL;
@@ -178,7 +178,7 @@ void tns_init(tns_t *tns, fileinfo_t *files, const int *cnt, int *sel,
if (homedir != NULL) {
free(cache_dir);
len = strlen(homedir) + strlen(dsuffix) + 6;
cache_dir = (char*) s_malloc(len);
cache_dir = (char*) emalloc(len);
snprintf(cache_dir, len, "%s%s/sxiv", homedir, dsuffix);
} else {
warn("could not locate thumbnail cache directory");