libopkg: fix merging PKG_CONFFILES in pkg_merge()

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

diff --git a/libopkg/pkg_src.c b/libopkg/pkg_src.c
index 0566b7faf30b2583eae4bb34d4644d1973f9b297..fae3ce37722ab9279f6baf9f1b68d265ffcce07f 100644 (file)
--- a/libopkg/pkg_src.c
+++ b/libopkg/pkg_src.c
@@ -1,4 +1,4 @@
-/* pkg_src.c - the itsy package management system
+/* pkg_src.c - the opkg package management system
 
    Carl D. Worth
 
@@ -15,29 +15,26 @@
    General Public License for more details.
 */
 
-#include "opkg.h"
-
 #include "pkg_src.h"
-#include "str_util.h"
+#include "libbb/libbb.h"
 
-int pkg_src_init(pkg_src_t *src, const char *name, const char *base_url, const char *extra_data, int gzip)
+int pkg_src_init(pkg_src_t * src, const char *name, const char *base_url,
+                const char *extra_data, int gzip)
 {
-    src->gzip = gzip;
-    src->name = str_dup_safe (name);
-    src->value = str_dup_safe (base_url);
-    if (extra_data)
-       src->extra_data = str_dup_safe (extra_data);
-    else
-       src->extra_data = NULL;
-    return 0;
+       src->gzip = gzip;
+       src->name = xstrdup(name);
+       src->value = xstrdup(base_url);
+       if (extra_data)
+               src->extra_data = xstrdup(extra_data);
+       else
+               src->extra_data = NULL;
+       return 0;
 }
 
-void pkg_src_deinit(pkg_src_t *src)
+void pkg_src_deinit(pkg_src_t * src)
 {
-    free (src->name);
-    free (src->value);
-    if (src->extra_data)
-       free (src->extra_data);
+       free(src->name);
+       free(src->value);
+       if (src->extra_data)
+               free(src->extra_data);
 }
-
-