libopkg/opkg_cmd.c: more robust PATH handling

[oweals/opkg-lede.git] / libopkg / nv_pair.c

diff --git a/libopkg/nv_pair.c b/libopkg/nv_pair.c
index 75a08e8dca0cd5040937446a5b39d21056a05715..d323ce5f4de653b1ec9d5cd09e5e58d20932e96a 100644 (file)
--- a/libopkg/nv_pair.c
+++ b/libopkg/nv_pair.c
@@ -1,4 +1,4 @@
-/* nv_pair.c - the itsy package management system
+/* nv_pair.c - the opkg package management system
 
    Carl D. Worth
 
@@ -15,26 +15,23 @@
    General Public License for more details.
 */
 
-#include "opkg.h"
-
 #include "nv_pair.h"
-#include "str_util.h"
+#include "libbb/libbb.h"
 
-int nv_pair_init(nv_pair_t *nv_pair, const char *name, const char *value)
+int nv_pair_init(nv_pair_t * nv_pair, const char *name, const char *value)
 {
-    nv_pair->name = str_dup_safe(name);
-    nv_pair->value = str_dup_safe(value);
 
-    return 0;
+       nv_pair->name = xstrdup(name);
+       nv_pair->value = xstrdup(value);
+
+       return 0;
 }
 
-void nv_pair_deinit(nv_pair_t *nv_pair)
+void nv_pair_deinit(nv_pair_t * nv_pair)
 {
-    free(nv_pair->name);
-    nv_pair->name = NULL;
+       free(nv_pair->name);
+       nv_pair->name = NULL;
 
-    free(nv_pair->value);
-    nv_pair->value = NULL;
+       free(nv_pair->value);
+       nv_pair->value = NULL;
 }
-
-