Initial stab at untangling the #include maze. Probably needs a second pass.

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

diff --git a/libopkg/pkg_src.c b/libopkg/pkg_src.c
index ec9c5f29f8abefd44b7a2628c165f366502d1526..690fef6720139b5c458ef05b72ad38b0995b3c88 100644 (file)
--- a/libopkg/pkg_src.c
+++ b/libopkg/pkg_src.c
@@ -15,18 +15,16 @@
    General Public License for more details.
 */
 
-#include "includes.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)
 {
     src->gzip = gzip;
-    src->name = str_dup_safe (name);
-    src->value = str_dup_safe (base_url);
+    src->name = xstrdup(name);
+    src->value = xstrdup(base_url);
     if (extra_data)
-       src->extra_data = str_dup_safe (extra_data);
+       src->extra_data = xstrdup(extra_data);
     else
        src->extra_data = NULL;
     return 0;
@@ -39,5 +37,3 @@ void pkg_src_deinit(pkg_src_t *src)
     if (src->extra_data)
        free (src->extra_data);
 }
-
-