opkg: fix some compiler warnings

git-svn-id: http://opkg.googlecode.com/svn/trunk@15 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358

diff --git a/opkg_download.c b/opkg_download.c
index fcc52949a8ac43876152c77d5321c110208d4dc6..8195e518fb69e518a44c82ff19c451c399b55046 100644 (file)
--- a/opkg_download.c
+++ b/opkg_download.c
@@ -79,7 +79,6 @@ int opkg_download(opkg_conf_t *conf, const char *src, const char *dest_file_name
     char *src_basec = strdup(src);
     char *src_base = basename(src_basec);
     char *tmp_file_location;
     char *src_basec = strdup(src);
     char *src_base = basename(src_basec);
     char *tmp_file_location;

-    char *cmd;

 
     opkg_message(conf,OPKG_NOTICE,"Downloading %s\n", src);
        
 
     opkg_message(conf,OPKG_NOTICE,"Downloading %s\n", src);
        


@@ -245,7 +244,7 @@ int opkg_prepare_url_for_install(opkg_conf_t *conf, const char *url, char **name
          if (err)
               return err;
          pkg->local_filename = strdup(url);
          if (err)
               return err;
          pkg->local_filename = strdup(url);

-         opkg_message(conf, OPKG_DEBUG2, "Package %s provided by hand \(%s\).\n", pkg->name,pkg->local_filename);
+         opkg_message(conf, OPKG_DEBUG2, "Package %s provided by hand (%s).\n", pkg->name,pkg->local_filename);

           pkg->provided_by_hand = 1;
 
      } else {
           pkg->provided_by_hand = 1;
 
      } else {

diff --git a/pkg.c b/pkg.c
index 80234edb2cf5c50b7bab14e6d8ef550b7acc9936..1202845e4fcd7d64601f70d0f315fb899490bcb5 100644 (file)
--- a/pkg.c
+++ b/pkg.c
@@ -1529,7 +1529,7 @@ char *pkg_state_flag_to_str(pkg_state_flag_t sf)
      }
 }
 
      }
 }
 

-pkg_state_flag_t pkg_state_flag_from_str(char *str)
+pkg_state_flag_t pkg_state_flag_from_str(const char *str)

 {
      int i;
      int sf = SF_OK;
 {
      int i;
      int sf = SF_OK;


@@ -1569,7 +1569,7 @@ char *pkg_state_status_to_str(pkg_state_status_t ss)
      return strdup("<STATE_STATUS_UNKNOWN>");
 }
 
      return strdup("<STATE_STATUS_UNKNOWN>");
 }
 

-pkg_state_status_t pkg_state_status_from_str(char *str)
+pkg_state_status_t pkg_state_status_from_str(const char *str)

 {
      int i;
 
 {
      int i;
 

diff --git a/pkg.h b/pkg.h
index 1bb4a4c2112a6680913317c04fd8e26dd1ddfae5..665191b789422adcbb2e97f6adaf32b065ee5440 100644 (file)
--- a/pkg.h
+++ b/pkg.h
@@ -216,9 +216,9 @@ int pkg_run_script(struct opkg_conf *conf, pkg_t *pkg,
 char *pkg_state_want_to_str(pkg_state_want_t sw);
 pkg_state_want_t pkg_state_want_from_str(char *str);
 char *pkg_state_flag_to_str(pkg_state_flag_t sf);
 char *pkg_state_want_to_str(pkg_state_want_t sw);
 pkg_state_want_t pkg_state_want_from_str(char *str);
 char *pkg_state_flag_to_str(pkg_state_flag_t sf);

-pkg_state_flag_t pkg_state_flag_from_str(char *str);
+pkg_state_flag_t pkg_state_flag_from_str(const char *str);

 char *pkg_state_status_to_str(pkg_state_status_t ss);
 char *pkg_state_status_to_str(pkg_state_status_t ss);

-pkg_state_status_t pkg_state_status_from_str(char *str);
+pkg_state_status_t pkg_state_status_from_str(const char *str);

 
 int pkg_version_satisfied(pkg_t *it, pkg_t *ref, const char *op);
 
 
 int pkg_version_satisfied(pkg_t *it, pkg_t *ref, const char *op);