summaryrefslogtreecommitdiffstats
path: root/libopkg/pkg.c
diff options
context:
space:
mode:
authorgraham.gower <graham.gower@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358>2009-11-03 22:14:59 (EST)
committer graham.gower <graham.gower@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358>2009-11-03 22:14:59 (EST)
commit11af232b19155c76002b5ca1f2b0e89d75699d3a (patch)
tree5e113943ec678935d2ae1ac60b7e70bd49165f6e /libopkg/pkg.c
parentedf1b1964b565726a0b0f730b109e4491c7929b9 (diff)
s/strdup/xstrdup/ - check memory allocations for failure.
git-svn-id: http://opkg.googlecode.com/svn/trunk@255 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358
Diffstat (limited to 'libopkg/pkg.c')
-rw-r--r--libopkg/pkg.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/libopkg/pkg.c b/libopkg/pkg.c
index e3e6c04..237db44 100644
--- a/libopkg/pkg.c
+++ b/libopkg/pkg.c
@@ -291,7 +291,7 @@ int pkg_init_from_file(pkg_t *pkg, const char *filename)
err = pkg_init(pkg);
if (err) { return err; }
- pkg->local_filename = strdup(filename);
+ pkg->local_filename = xstrdup(filename);
control_file = tmpfile();
err = pkg_extract_control_file_to_stream(pkg, control_file);
@@ -957,13 +957,13 @@ char *pkg_version_str_alloc(pkg_t *pkg)
if (pkg->epoch) {
sprintf_alloc(&epoch_str, "%d:", pkg->epoch);
} else {
- epoch_str = strdup("");
+ epoch_str = xstrdup("");
}
if (pkg->revision && strlen(pkg->revision)) {
sprintf_alloc(&revision_str, "-%s", pkg->revision);
} else {
- revision_str = strdup("");
+ revision_str = xstrdup("");
}
@@ -1224,13 +1224,13 @@ char *pkg_state_want_to_str(pkg_state_want_t sw)
for (i=0; i < ARRAY_SIZE(pkg_state_want_map); i++) {
if (pkg_state_want_map[i].value == sw) {
- return strdup(pkg_state_want_map[i].str);
+ return xstrdup(pkg_state_want_map[i].str);
}
}
fprintf(stderr, "%s: ERROR: Illegal value for state_want: %d\n",
__FUNCTION__, sw);
- return strdup("<STATE_WANT_UNKNOWN>");
+ return xstrdup("<STATE_WANT_UNKNOWN>");
}
pkg_state_want_t pkg_state_want_from_str(char *str)
@@ -1258,7 +1258,7 @@ char *pkg_state_flag_to_str(pkg_state_flag_t sf)
sf &= SF_NONVOLATILE_FLAGS;
if (sf == 0) {
- return strdup("ok");
+ return xstrdup("ok");
} else {
for (i=0; i < ARRAY_SIZE(pkg_state_flag_map); i++) {
@@ -1315,13 +1315,13 @@ char *pkg_state_status_to_str(pkg_state_status_t ss)
for (i=0; i < ARRAY_SIZE(pkg_state_status_map); i++) {
if (pkg_state_status_map[i].value == ss) {
- return strdup(pkg_state_status_map[i].str);
+ return xstrdup(pkg_state_status_map[i].str);
}
}
fprintf(stderr, "%s: ERROR: Illegal value for state_status: %d\n",
__FUNCTION__, ss);
- return strdup("<STATE_STATUS_UNKNOWN>");
+ return xstrdup("<STATE_STATUS_UNKNOWN>");
}
pkg_state_status_t pkg_state_status_from_str(const char *str)