Changeset 1422

Timestamp:

03/20/07 06:42:10 (6 years ago)

Author:

caowai_song

Message:

Fix the bug that last commit.

Location:

trunk/src/target/OM-2007/applications/openmoko-appmanager/src

Files:

• install-dialog.c (modified) (3 diffs)
• ipkg_cmd.h (modified) (1 diff)
• ipkgapi.c (modified) (1 diff)
• ipkgapi.h (modified) (1 diff)
• package-list.c (modified) (2 diffs)

trunk/src/target/OM-2007/applications/openmoko-appmanager/src/install-dialog.c

@@ -39 +39 @@
 typedef struct _InstallDialogPriv {
   ApplicationManagerData   *maindata;    /* The main data of the application manager */
-  gchar    *installinfolist;            /* The list of install/remove/upgrade infomation */
-  gchar    *prepareinfolist;            /* The list of prepareinfomation */
+  gchar    **installinfolist;            /* The list of install/remove/upgrade infomation */
+  gchar    **prepareinfolist;            /* The list of prepareinfomation */
   gint     preparenum;                   /* Prepare to install/remove/upgrade the _number_ package */
   gint     installnum;                   /* Installing/removing/upgrading the _number_ package */
@@ -120 +120 @@
   InstallDialogPriv *priv = MOKO_INSTALL_DIALOG_GET_PRIVATE (dialog);
 
-  priv->installinfolist = (gchar *)g_malloc (sizeof(gchar *) * pkgnum);
+  priv->installinfolist = (gchar **)g_malloc (sizeof(gchar *) * pkgnum);
   if (priv->installinfolist == NULL)
     {
@@ -127 +127 @@
       return NULL;
     }
-  priv->prepareinfolist = (gchar *)g_malloc (sizeof(gchar *) * pkgnum);
+  priv->prepareinfolist = (gchar **)g_malloc (sizeof(gchar *) * pkgnum);
   if (priv->prepareinfolist == NULL)
     {

trunk/src/target/OM-2007/applications/openmoko-appmanager/src/ipkg_cmd.h

@@ -30 +30 @@
  * @brief See libipkg.a document.
  */
-extern int ipkg_prepare_url_for_install(ipkg_conf_t *conf, const char *url, char *namep);
+extern int ipkg_prepare_url_for_install(ipkg_conf_t *conf, const char *url, char **namep);
 
 /*

trunk/src/target/OM-2007/applications/openmoko-appmanager/src/ipkgapi.c

@@ -906 +906 @@
  *         Call get_error_msg to get error message.
  */
-int ipkg_install_cmd(char *pkg_name, char *dest_name, char *pkg_real_name)
+int ipkg_install_cmd(char *pkg_name, char *dest_name, char **pkg_real_name)
 {
     char *arg;

trunk/src/target/OM-2007/applications/openmoko-appmanager/src/ipkgapi.h

@@ -85 +85 @@
 PACKAGE_DETAIL_INFO *ipkg_get_pkg_detail_info(char *pkg_name, pkg_query_status_t query_status);
 
-int ipkg_install_cmd(char *pkg_name, char *dest_name, char *pkg_real_name);
+int ipkg_install_cmd(char *pkg_name, char *dest_name, char **pkg_real_name);
 int ipkg_remove_cmd(char *pkg_name);
 int ipkg_search_cmd(char *pkg_name, PKG_LIST_HEAD *pkg_list_head);

trunk/src/target/OM-2007/applications/openmoko-appmanager/src/package-list.c

@@ -83 +83 @@
       val= vp;
       ref= rp;
-      vl=0;  if (isdigit(*vp)) vl= strtol(val,(char*)&val,10);
-      rl=0;  if (isdigit(*rp)) rl= strtol(ref,(char*)&ref,10);
+      vl=0;  if (isdigit(*vp)) vl= strtol(val,(char**)&val,10);
+      rl=0;  if (isdigit(*rp)) rl= strtol(ref,(char**)&ref,10);
       if (vl != rl) return vl - rl;
 
@@ -233 +233 @@
 static gint 
 package_list_search_section_node (const char *name, 
-                                  SectionList *section, 
+                                  SectionList **section, 
                                   SectionList *sechead)
 {