5734f64 Remove useless sbuf_get() — HardenedBSD-pkg

modified libpkg/packing.c

@@ -315,7 +315,7 @@ packing_append_tree(struct packing *pack, const char *treepath,

 			 sbuf_cat(sb, fts_e->fts_path + treelen + 1);
 			 sbuf_finish(sb);
 			 packing_append_file_attr(pack, fts_e->fts_name,
 			    sbuf_get(sb), NULL, NULL, 0, 0);
 			    sbuf_data(sb), NULL, NULL, 0, 0);
 			 break;
 		case FTS_DC:
 		case FTS_DNR:

modified libpkg/pkg_attributes.c

@@ -182,7 +182,10 @@ pkg_script_get(struct pkg const * const p, pkg_script i)

 	if (p->scripts[i] == NULL)
 		return (NULL);
 	return (sbuf_get(p->scripts[i]));
 	if (sbuf_done(p->scripts[i]) == 0)
 		sbuf_finish(p->scripts[i]);
 	return (sbuf_data(p->scripts[i]));
 }
 /*

modified libpkg/pkg_manifest.c

@@ -496,7 +496,7 @@ pkg_obj(struct pkg *pkg, const ucl_object_t *obj, int attr)

 			if (cur->type == UCL_STRING) {
 				buf = ucl_object_tolstring(cur, &len);
 				urldecode(key, &tmp);
 				pkg_addfile(pkg, sbuf_get(tmp), len == 64 ? buf : NULL, false);
 				pkg_addfile(pkg, sbuf_data(tmp), len == 64 ? buf : NULL, false);
 			} else if (cur->type == UCL_OBJECT)
 				pkg_set_files_from_object(pkg, cur);
 			else

@@ -1332,7 +1332,7 @@ pkg_emit_manifest(struct pkg *pkg, char **dest, short flags, char **pdigest)

 	}
 	sbuf_finish(b);
 	*dest = strdup(sbuf_get(b));
 	*dest = strdup(sbuf_data(b));
 	sbuf_delete(b);
 	return (rc);

modified libpkg/pkg_ports.c

@@ -1121,7 +1121,7 @@ flush_script_buffer(struct sbuf *buf, struct pkg *p, int type)

 {
 	if (sbuf_len(buf) > 0) {
 		sbuf_finish(buf);
 		pkg_appendscript(p, sbuf_get(buf), type);
 		pkg_appendscript(p, sbuf_data(buf), type);
 	}
 }

modified libpkg/plugins.c

@@ -162,7 +162,13 @@ pkg_plugin_get(struct pkg_plugin *p, pkg_plugin_key key)

 {
 	assert(p != NULL);
 	return (sbuf_get(p->fields[key]));
 	if (p->fields[key] == NULL)
 		return (NULL);
 	if (sbuf_done(p->fields[key]) == 0)
 		sbuf_finish(p->fields[key]);
 	return (sbuf_data(p->fields[key]));
 }
 int

modified libpkg/private/utils.h

@@ -70,7 +70,6 @@ struct rsa_key {

 void sbuf_init(struct sbuf **);
 int sbuf_set(struct sbuf **, const char *);
 char * sbuf_get(struct sbuf *);
 void sbuf_reset(struct sbuf *);
 void sbuf_free(struct sbuf *);

modified libpkg/repo/binary/query.c

@@ -128,11 +128,12 @@ pkg_repo_binary_query(struct pkg_repo *repo, const char *pattern, match_t match)

 	sbuf_cat(sql, " ORDER BY name;");
 	sbuf_finish(sql);
 	pkg_debug(4, "Pkgdb: running '%s' query for %s", sbuf_get(sql),
 	pkg_debug(4, "Pkgdb: running '%s' query for %s", sbuf_data(sql),
 	     pattern == NULL ? "all": pattern);
 	ret = sqlite3_prepare_v2(sqlite, sbuf_get(sql), sbuf_len(sql), &stmt, NULL);
 	ret = sqlite3_prepare_v2(sqlite, sbuf_data(sql), sbuf_len(sql), &stmt,
 	    NULL);
 	if (ret != SQLITE_OK) {
 		ERROR_SQLITE(sqlite, sbuf_get(sql));
 		ERROR_SQLITE(sqlite, sbuf_data(sql));
 		sbuf_delete(sql);
 		return (NULL);
 	}

@@ -168,10 +169,10 @@ pkg_repo_binary_shlib_provide(struct pkg_repo *repo, const char *require)

 	sbuf_finish(sql);
 	pkg_debug(4, "Pkgdb: running '%s'", sbuf_get(sql));
 	ret = sqlite3_prepare_v2(sqlite, sbuf_get(sql), -1, &stmt, NULL);
 	pkg_debug(4, "Pkgdb: running '%s'", sbuf_data(sql));
 	ret = sqlite3_prepare_v2(sqlite, sbuf_data(sql), -1, &stmt, NULL);
 	if (ret != SQLITE_OK) {
 		ERROR_SQLITE(sqlite, sbuf_get(sql));
 		ERROR_SQLITE(sqlite, sbuf_data(sql));
 		sbuf_delete(sql);
 		return (NULL);
 	}

@@ -206,10 +207,10 @@ pkg_repo_binary_provide(struct pkg_repo *repo, const char *require)

 	sbuf_finish(sql);
 	pkg_debug(4, "Pkgdb: running '%s'", sbuf_get(sql));
 	ret = sqlite3_prepare_v2(sqlite, sbuf_get(sql), -1, &stmt, NULL);
 	pkg_debug(4, "Pkgdb: running '%s'", sbuf_data(sql));
 	ret = sqlite3_prepare_v2(sqlite, sbuf_data(sql), -1, &stmt, NULL);
 	if (ret != SQLITE_OK) {
 		ERROR_SQLITE(sqlite, sbuf_get(sql));
 		ERROR_SQLITE(sqlite, sbuf_data(sql));
 		sbuf_delete(sql);
 		return (NULL);
 	}

@@ -243,10 +244,10 @@ pkg_repo_binary_shlib_require(struct pkg_repo *repo, const char *provide)

 	sbuf_finish(sql);
 	pkg_debug(4, "Pkgdb: running '%s'", sbuf_get(sql));
 	ret = sqlite3_prepare_v2(sqlite, sbuf_get(sql), -1, &stmt, NULL);
 	pkg_debug(4, "Pkgdb: running '%s'", sbuf_data(sql));
 	ret = sqlite3_prepare_v2(sqlite, sbuf_data(sql), -1, &stmt, NULL);
 	if (ret != SQLITE_OK) {
 		ERROR_SQLITE(sqlite, sbuf_get(sql));
 		ERROR_SQLITE(sqlite, sbuf_data(sql));
 		sbuf_delete(sql);
 		return (NULL);
 	}

@@ -281,10 +282,10 @@ pkg_repo_binary_require(struct pkg_repo *repo, const char *provide)

 	sbuf_finish(sql);
 	pkg_debug(4, "Pkgdb: running '%s'", sbuf_get(sql));
 	ret = sqlite3_prepare_v2(sqlite, sbuf_get(sql), -1, &stmt, NULL);
 	pkg_debug(4, "Pkgdb: running '%s'", sbuf_data(sql));
 	ret = sqlite3_prepare_v2(sqlite, sbuf_data(sql), -1, &stmt, NULL);
 	if (ret != SQLITE_OK) {
 		ERROR_SQLITE(sqlite, sbuf_get(sql));
 		ERROR_SQLITE(sqlite, sbuf_data(sql));
 		sbuf_delete(sql);
 		return (NULL);
 	}

@@ -417,10 +418,10 @@ pkg_repo_binary_search(struct pkg_repo *repo, const char *pattern, match_t match

 	sbuf_cat(sql, ";");
 	sbuf_finish(sql);
 	pkg_debug(4, "Pkgdb: running '%s'", sbuf_get(sql));
 	ret = sqlite3_prepare_v2(sqlite, sbuf_get(sql), -1, &stmt, NULL);
 	pkg_debug(4, "Pkgdb: running '%s'", sbuf_data(sql));
 	ret = sqlite3_prepare_v2(sqlite, sbuf_data(sql), -1, &stmt, NULL);
 	if (ret != SQLITE_OK) {
 		ERROR_SQLITE(sqlite, sbuf_get(sql));
 		ERROR_SQLITE(sqlite, sbuf_data(sql));
 		sbuf_delete(sql);
 		return (NULL);
 	}

modified libpkg/scripts.c

@@ -132,7 +132,7 @@ pkg_script_run(struct pkg * const pkg, pkg_script type)

 				argmax -= strlen(*ep) + 1 + sizeof(*ep);
 			argmax -= 1 + sizeof(*ep);
 			pkg_debug(3, "Scripts: executing\n--- BEGIN ---\n%s\nScripts: --- END ---", sbuf_get(script_cmd));
 			pkg_debug(3, "Scripts: executing\n--- BEGIN ---\n%s\nScripts: --- END ---", sbuf_data(script_cmd));
 			if (sbuf_len(script_cmd) > argmax) {
 				if (pipe(stdin_pipe) < 0) {
 					ret = EPKG_FATAL;

@@ -152,7 +152,7 @@ pkg_script_run(struct pkg * const pkg, pkg_script type)

 			} else {
 				argv[0] = _PATH_BSHELL;
 				argv[1] = "-c";
 				argv[2] = sbuf_get(script_cmd);
 				argv[2] = sbuf_data(script_cmd);
 				argv[3] = NULL;
 				use_pipe = 0;

@@ -169,7 +169,7 @@ pkg_script_run(struct pkg * const pkg, pkg_script type)

 			}
 			if (use_pipe) {
 				script_cmd_p = sbuf_get(script_cmd);
 				script_cmd_p = sbuf_data(script_cmd);
 				script_cmd_len = sbuf_len(script_cmd);
 				while (script_cmd_len > 0) {
 					if ((bytes_written = write(stdin_pipe[1], script_cmd_p,

modified libpkg/utils.c

@@ -76,18 +76,6 @@ sbuf_set(struct sbuf **buf, const char *str)

 	return (0);
 }
 char *
 sbuf_get(struct sbuf *buf)
 {
 	if (buf == NULL)
 		return (__DECONST(char *, ""));
 	if (sbuf_done(buf) == 0)
 		sbuf_finish(buf);
 	return (sbuf_data(buf));
 }
 void
 sbuf_reset(struct sbuf *buf)
 {