summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/pacman/callback.c3
-rw-r--r--src/pacman/conf.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/pacman/callback.c b/src/pacman/callback.c
index aec9753a..3061d2a0 100644
--- a/src/pacman/callback.c
+++ b/src/pacman/callback.c
@@ -396,8 +396,9 @@ void cb_trans_progress(pmtransprog_t event, const char *pkgname, int percent,
oprlen = strlen(opr);
wcopr = calloc(oprlen, sizeof(wchar_t));
if(!wcopr) {
- fprintf(stderr, "malloc failure: could not allocate %d bytes\n",
+ fprintf(stderr, "malloc failure: could not allocate %zd bytes\n",
strlen(opr) * sizeof(wchar_t));
+ return;
}
oprlen = mbstowcs(wcopr, opr, oprlen);
diff --git a/src/pacman/conf.c b/src/pacman/conf.c
index 2bc69820..21256d77 100644
--- a/src/pacman/conf.c
+++ b/src/pacman/conf.c
@@ -32,8 +32,9 @@ config_t *config_new(void)
{
config_t *newconfig = calloc(1, sizeof(config_t));
if(!newconfig) {
- fprintf(stderr, "malloc failure: could not allocate %d bytes\n",
+ fprintf(stderr, "malloc failure: could not allocate %zd bytes\n",
sizeof(config_t));
+ return(NULL);
}
/* defaults which may get overridden later */
newconfig->op = PM_OP_MAIN;