Remove stray semicolon.

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

diff --git a/libopkg/pkg_dest.c b/libopkg/pkg_dest.c
index b1b502ace75be540d8bb314b70856804b6d4ee2c..d56dd78b84c956f5cf01e19fd143ee7b9b206a05 100644 (file)
--- a/libopkg/pkg_dest.c
+++ b/libopkg/pkg_dest.c
@@ -15,11 +15,10 @@
    General Public License for more details.
 */
 
-#include "includes.h"
+#include <stdio.h>
 
 #include "pkg_dest.h"
 #include "file_util.h"
-#include "str_util.h"
 #include "sprintf_alloc.h"
 #include "opkg_conf.h"
 #include "opkg_cmd.h"
@@ -31,7 +30,7 @@ int pkg_dest_init(pkg_dest_t *dest, const char *name, const char *root_dir,const
     dest->name = xstrdup(name);
 
     /* Guarantee that dest->root_dir ends with a '/' */
-    if (str_ends_with(root_dir, "/")) {
+    if (root_dir[strlen(root_dir) -1] == '/') {
        dest->root_dir = xstrdup(root_dir);
     } else {
        sprintf_alloc(&dest->root_dir, "%s/", root_dir);
@@ -42,7 +41,7 @@ int pkg_dest_init(pkg_dest_t *dest, const char *name, const char *root_dir,const
                  dest->root_dir, OPKG_STATE_DIR_PREFIX);
     file_mkdir_hier(dest->opkg_dir, 0755);
 
-    if (str_starts_with (lists_dir, "/")) 
+    if (lists_dir[0] == '/')
         sprintf_alloc(&dest->lists_dir, "%s", lists_dir);
     else
         sprintf_alloc(&dest->lists_dir, "/%s", lists_dir);
@@ -56,11 +55,6 @@ int pkg_dest_init(pkg_dest_t *dest, const char *name, const char *root_dir,const
     sprintf_alloc(&dest->status_file_name, "%s/%s",
                  dest->opkg_dir, OPKG_STATUS_FILE_SUFFIX);
 
-    sprintf_alloc(&dest->status_file_tmp_name, "%s/%s.tmp",
-                 dest->opkg_dir, OPKG_STATUS_FILE_SUFFIX);
-
-    dest->status_file = NULL;
-
     return 0;
 }
 
@@ -84,13 +78,5 @@ void pkg_dest_deinit(pkg_dest_t *dest)
     free(dest->status_file_name);
     dest->status_file_name = NULL;
 
-    free(dest->status_file_tmp_name);
-    dest->status_file_tmp_name = NULL;
-
-    if (dest->status_file) {
-       fclose(dest->status_file);
-    }
-    dest->status_file = NULL;
-
     dest->root_dir = NULL;
 }