emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xbps_xasprintf: do not return NULL anymore; remove checks for this.

Browse Source
This commit is contained in:
Juan RP
2012-11-11 09:37:27 +01:00
parent 0ab60b24c5
commit d6735d5685
27 changed files with 4 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/package_config_files.c
View File

@ -105,11 +105,6 @@ xbps_entry_install_conf_file(struct xbps_handle *xhp,
prop_dictionary_get_cstring_nocopy(obj2,
"file", &cffile);
buf = xbps_xasprintf(".%s", cffile);
if (buf == NULL) {
prop_object_iterator_release(iter2);
rv = -1;
goto out;
}
if (strcmp(entry_pname, buf) == 0) {
prop_dictionary_get_cstring(obj2, "sha256",
&sha256_orig);
@ -138,10 +133,6 @@ xbps_entry_install_conf_file(struct xbps_handle *xhp,
while ((obj = prop_object_iterator_next(iter))) {
prop_dictionary_get_cstring_nocopy(obj, "file", &cffile);
buf = xbps_xasprintf(".%s", cffile);
if (buf == NULL) {
prop_object_iterator_release(iter);
return -1;
}
if (strcmp(entry_pname, buf)) {
free(buf);
buf = NULL;
@ -232,10 +223,6 @@ xbps_entry_install_conf_file(struct xbps_handle *xhp,
(strcmp(sha256_orig, sha256_new))) {
buf = xbps_xasprintf(".%s.new-%s",
cffile, version);
if (buf == NULL) {
rv = -1;
break;
}
xbps_set_cb_state(xhp, XBPS_STATE_CONFIG_FILE,
0, pkgname, version,
"Installing new configuration file to "