Changeset 4204

Timestamp:

03/13/08 16:38:39 (5 years ago)

Author:

thomas

Message:

opkg: enable -Werror in libopkg and fix resulting build failures

Location:

trunk/src/target/opkg/libopkg

Files:

• Makefile.am (modified) (1 diff)
• file_util.c (modified) (1 diff)
• opkg_conf.c (modified) (2 diffs)
• opkg_configure.c (modified) (1 diff)
• pkg.c (modified) (2 diffs)
• pkg.h (modified) (1 diff)
• pkg_vec.c (modified) (4 diffs)
• pkg_vec.h (modified) (2 diffs)

trunk/src/target/opkg/libopkg/Makefile.am

@@ -1 +1 @@
 
-ALL_CFLAGS=-g -O -Wall -DHOST_CPU_STR=\"@host_cpu@\" -DBUILD_CPU=@build_cpu@ -DLIBDIR=\"@libdir@\" -DOPKGLIBDIR=\"@opkglibdir@\" -DDATADIR=\"@datadir@\" -I$(top_srcdir)
+ALL_CFLAGS=-g -O -Wall -Werror -DHOST_CPU_STR=\"@host_cpu@\" -DBUILD_CPU=@build_cpu@ -DLIBDIR=\"@libdir@\" -DOPKGLIBDIR=\"@opkglibdir@\" -DDATADIR=\"@datadir@\" -I$(top_srcdir)
 
 libopkg_includedir=$(includedir)/libopkg

trunk/src/target/opkg/libopkg/file_util.c

@@ -141 +141 @@
     int i, err;
     FILE *file;
-    unsigned char *md5sum_hex;
+    char *md5sum_hex;
     unsigned char md5sum_bin[md5sum_bin_len];
 

trunk/src/target/opkg/libopkg/opkg_conf.c

@@ -552 +552 @@
                opkg_conf_set_option(options, name, value);
           } else if (strcmp(type, "src") == 0) {
-               if (!nv_pair_list_find(pkg_src_list, name)) {
+               if (!nv_pair_list_find((nv_pair_list_t*) pkg_src_list, name)) {
                     pkg_src_list_append (pkg_src_list, name, value, extra, 0);
                } else {
@@ -559 +559 @@
                }
           } else if (strcmp(type, "src/gz") == 0) {
-               if (!nv_pair_list_find(pkg_src_list, name)) {
+               if (!nv_pair_list_find((nv_pair_list_t*) pkg_src_list, name)) {
                     pkg_src_list_append (pkg_src_list, name, value, extra, 1);
                } else {

trunk/src/target/opkg/libopkg/opkg_configure.c

@@ -17 +17 @@
 
 #include "opkg.h"
-
+#include "sprintf_alloc.h"
 #include "opkg_configure.h"
 #include "opkg_state.h"

trunk/src/target/opkg/libopkg/pkg.c

@@ -1160 +1160 @@
 }
 
-int pkg_name_version_and_architecture_compare(void *p1, void *p2)
-{
-     const pkg_t *a = *(const pkg_t **)p1;
-     const pkg_t *b = *(const pkg_t **)p2;
+int pkg_name_version_and_architecture_compare(const void *p1, const void *p2)
+{
+     const pkg_t *a = *(const pkg_t**) p1;
+     const pkg_t *b = *(const pkg_t**) p2;
      int namecmp;
      int vercmp;
@@ -1190 +1190 @@
 }
 
-int abstract_pkg_name_compare(void *p1, void *p2)
+int abstract_pkg_name_compare(const void *p1, const void *p2)
 {
      const abstract_pkg_t *a = *(const abstract_pkg_t **)p1;

trunk/src/target/opkg/libopkg/pkg.h

@@ -200 +200 @@
 
 int pkg_compare_versions(const pkg_t *pkg, const pkg_t *ref_pkg);
-int pkg_name_version_and_architecture_compare(void *a, void *b);
-int abstract_pkg_name_compare(void *a, void *b);
+int pkg_name_version_and_architecture_compare(const void *a, const void *b);
+int abstract_pkg_name_compare(const void *a, const void *b);
 
 char * pkg_formatted_info(pkg_t *pkg );

trunk/src/target/opkg/libopkg/pkg_vec.c

@@ -102 +102 @@
 void pkg_vec_insert(pkg_vec_t *vec, const pkg_t *pkg)
 {
-     int i;
      int found = 0;
 
@@ -133 +132 @@
 }
 
-typedef int (*compare_fcn_t)(const void *, const void *);
-void pkg_vec_sort(pkg_vec_t *vec, int (*compar)(pkg_t *, pkg_t *))
-{
-     qsort(vec->pkgs, vec->len, sizeof(pkg_t *), (compare_fcn_t)compar);
+void pkg_vec_sort(pkg_vec_t *vec, compare_fcn_t compar)
+{
+     qsort(vec->pkgs, vec->len, sizeof(pkg_t *), compar);
 }
 
@@ -192 +190 @@
 void abstract_pkg_vec_insert(abstract_pkg_vec_t *vec, abstract_pkg_t *pkg)
 {
-    int i;
 
 #if 0
@@ -230 +227 @@
 }
 
-void abstract_pkg_vec_sort(pkg_vec_t *vec, int (*compar)(abstract_pkg_t *, abstract_pkg_t *))
-{
-     qsort(vec->pkgs, vec->len, sizeof(pkg_t *), (compare_fcn_t)compar);
-}
-
+void abstract_pkg_vec_sort(pkg_vec_t *vec, compare_fcn_t compar)
+{
+     qsort(vec->pkgs, vec->len, sizeof(pkg_t *), compar);
+}
+

trunk/src/target/opkg/libopkg/pkg_vec.h

@@ -48 +48 @@
 void pkg_vec_insert(pkg_vec_t *vec, const pkg_t *pkg);
 int pkg_vec_contains(pkg_vec_t *vec, pkg_t *apkg);
-void pkg_vec_sort(pkg_vec_t *vec, int (*compar)(pkg_t *, pkg_t *));
+
+typedef int (*compare_fcn_t)(const void *, const void *);
+void pkg_vec_sort(pkg_vec_t *vec, compare_fcn_t compar);
 
 int pkg_vec_clear_marks(pkg_vec_t *vec);
@@ -58 +60 @@
 abstract_pkg_t * abstract_pkg_vec_get(abstract_pkg_vec_t *vec, int i);
 int abstract_pkg_vec_contains(abstract_pkg_vec_t *vec, abstract_pkg_t *apkg);
-void abstract_pkg_vec_sort(pkg_vec_t *vec, int (*compar)(abstract_pkg_t *, abstract_pkg_t *));
+void abstract_pkg_vec_sort(pkg_vec_t *vec, compare_fcn_t compar);
 #endif