bin/xbps-rindex: cleanup error returns

Author: Duncaen

bin/xbps-rindex/repoflush.c

@@ -110,12 +110,10 @@ archive_dict(struct archive *ar, const char *filename, xbps_dictionary_t dict)
 	errno = 0;
 	buf = xbps_dictionary_externalize(dict);
 	if (!buf) {
-		r = -errno;
-		xbps_error_printf("failed to externalize dictionary for: %s\n",
-		    filename);
-		if (r == 0)
-			return -EINVAL;
-		return 0;
+		if (errno == 0)
+			errno = EINVAL;
+		return xbps_error_errno(errno,
+		    "failed to externalize dictionary for: %s\n", filename);
 	}
 
 	r = xbps_archive_append_buf(ar, buf, strlen(buf), filename, 0644,
@@ -147,23 +145,23 @@ repodata_flush(const char *repodir,
 
 	r = snprintf(path, sizeof(path), "%s/%s-repodata", repodir, arch);
 	if (r < 0 || (size_t)r >= sizeof(tmp)) {
-		xbps_error_printf("repodata path too long: %s: %s\n", path,
+		return xbps_error_errno(ENAMETOOLONG,
+		    "repodata path too long: %s: %s\n", path,
 		    strerror(ENAMETOOLONG));
-		return -ENAMETOOLONG;
 	}
 
 	r = snprintf(tmp, sizeof(tmp), "%s.XXXXXXX", path);
 	if (r < 0 || (size_t)r >= sizeof(tmp)) {
-		xbps_error_printf("repodata tmp path too long: %s: %s\n", path,
+		return xbps_error_errno(ENAMETOOLONG,
+		    "repodata tmp path too long: %s: %s\n", path,
 		    strerror(ENAMETOOLONG));
-		return -ENAMETOOLONG;
 	}
 
 	prevumask = umask(S_IXUSR|S_IRWXG|S_IRWXO);
 	fd = mkstemp(tmp);
 	if (fd == -1) {
-		r = -errno;
-		xbps_error_printf("failed to open temp file: %s: %s", tmp, strerror(-r));
+		r = xbps_error_errno(errno, "failed to open temp file: %s: %s",
+		    tmp, strerror(-r));
 		umask(prevumask);
 		goto err;
 	}
@@ -194,8 +192,7 @@ repodata_flush(const char *repodir,
 		goto err;
 	}
 	if (archive_write_free(ar) == ARCHIVE_FATAL) {
-		r = -errno;
-		xbps_error_printf("failed to free archive: %s\n", strerror(-r));
+		r = xbps_error_errno(errno, "failed to free archive: %s\n", strerror(errno));
 		goto err;
 	}
 
@@ -206,19 +203,18 @@ repodata_flush(const char *repodir,
 #endif
 
 	if (fchmod(fd, 0664) == -1) {
-		errno = -r;
-		xbps_error_printf("failed to set mode: %s: %s\n",
-		   tmp, strerror(-r));
+		r = xbps_error_errno(errno, "failed to set mode: %s: %s\n", tmp,
+		    strerror(errno));
 		close(fd);
 		unlink(tmp);
 		return r;
 	}
 	close(fd);
 
 	if (rename(tmp, path) == -1) {
-		r = -errno;
-		xbps_error_printf("failed to rename repodata: %s: %s: %s\n",
-		   tmp, path, strerror(-r));
+		r = xbps_error_errno(errno,
+		    "failed to rename repodata: %s: %s: %s\n", tmp, path,
+		    strerror(errno));
 		unlink(tmp);
 		return r;
 	}

bin/xbps-rindex/sign.c

@@ -168,14 +168,14 @@ sign_repo(struct xbps_handle *xhp, const char *repodir,
 	 */
 	repo = xbps_repo_open(xhp, repodir);
 	if (repo == NULL) {
-		r = -errno;
-		xbps_error_printf("%s: cannot read repository data: %s\n",
-		    _XBPS_RINDEX, strerror(errno));
+		r = xbps_error_errno(errno,
+		    "%s: cannot read repository data: %s\n", _XBPS_RINDEX,
+		    strerror(errno));
 		goto out;
 	}
 	if (xbps_dictionary_count(repo->idx) == 0) {
-		r = -EINVAL;
-		xbps_error_printf("%s: invalid repository, exiting!\n", _XBPS_RINDEX);
+		r = xbps_error_errno(
+		    EINVAL, "%s: invalid repository, exiting!\n", _XBPS_RINDEX);
 		goto out;
 	}
 
@@ -193,11 +193,15 @@ sign_repo(struct xbps_handle *xhp, const char *repodir,
 
 	meta = xbps_dictionary_create();
 	if (!meta) {
-		r = -ENOMEM;
+		r = xbps_error_oom();
 		goto out;
 	}
 
 	data = xbps_data_create_data(buf, strlen(buf));
+	if (!data) {
+		r = xbps_error_oom();
+		goto out;
+	}
 	rpubkey = xbps_dictionary_get(repo->idxmeta, "public-key");
 	if (!xbps_data_equals(rpubkey, data))
 		flush = true;