moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-22 15:58:50 -05:00
Code Issues Releases Wiki Activity

lib/handle: use CALLOC macro instead of bare calloc

Browse Source 
Signed-off-by: Dave Reisner <d@falconindy.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dave Reisner 2011-06-19 08:47:23 -04:00 committed by Dan McGee
parent 36ae77dd49
commit eb2d607899
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libalpm/handle.c
View File

@ -243,7 +243,7 @@ static char *canonicalize_path(const char *path) {
if(path[len - 1] != '/') { if(path[len - 1] != '/') {
len += 1; len += 1;
} }
new_path = calloc(len + 1, sizeof(char)); CALLOC(new_path, len + 1, sizeof(char), return NULL);
strncpy(new_path, path, len); strncpy(new_path, path, len);
new_path[len - 1] = '/'; new_path[len - 1] = '/';
return new_path; return new_path;
@ -264,7 +264,7 @@ enum _pmerrno_t _alpm_set_directory_option(const char *value,
if(stat(path, &st) == -1 || !S_ISDIR(st.st_mode)) { if(stat(path, &st) == -1 || !S_ISDIR(st.st_mode)) {
return PM_ERR_NOT_A_DIR; return PM_ERR_NOT_A_DIR;
} }
real = calloc(PATH_MAX, sizeof(char)); CALLOC(real, PATH_MAX, sizeof(char), return PM_ERR_MEMORY);
if(!realpath(path, real)) { if(!realpath(path, real)) {
free(real); free(real);
return PM_ERR_NOT_A_DIR; return PM_ERR_NOT_A_DIR;
@ -325,7 +325,7 @@ int SYMEXPORT alpm_option_remove_cachedir(pmhandle_t *handle, const char *cached
if(cachedir[cachedirlen-1] != '/') { if(cachedir[cachedirlen-1] != '/') {
cachedirlen += 1; cachedirlen += 1;
} }
newcachedir = calloc(cachedirlen + 1, sizeof(char)); CALLOC(newcachedir, cachedirlen + 1, sizeof(char), return 0);
strncpy(newcachedir, cachedir, cachedirlen); strncpy(newcachedir, cachedir, cachedirlen);
newcachedir[cachedirlen-1] = '/'; newcachedir[cachedirlen-1] = '/';
handle->cachedirs = alpm_list_remove_str(handle->cachedirs, newcachedir, &vdata); handle->cachedirs = alpm_list_remove_str(handle->cachedirs, newcachedir, &vdata);