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

caowai_song at sita.openmoko.org caowai_song at sita.openmoko.org
Tue Mar 20 06:42:25 CET 2007


Author: caowai_song
Date: 2007-03-20 06:42:10 +0100 (Tue, 20 Mar 2007)
New Revision: 1422

Modified:
   trunk/src/target/OM-2007/applications/openmoko-appmanager/src/install-dialog.c
   trunk/src/target/OM-2007/applications/openmoko-appmanager/src/ipkg_cmd.h
   trunk/src/target/OM-2007/applications/openmoko-appmanager/src/ipkgapi.c
   trunk/src/target/OM-2007/applications/openmoko-appmanager/src/ipkgapi.h
   trunk/src/target/OM-2007/applications/openmoko-appmanager/src/package-list.c
Log:
Fix the bug that last commit.


Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/src/install-dialog.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/install-dialog.c	2007-03-20 03:50:56 UTC (rev 1421)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/install-dialog.c	2007-03-20 05:42:10 UTC (rev 1422)
@@ -38,8 +38,8 @@
  */
 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 */
   gint     displaypreparenum;            /* Prepare info of the _number_ package has been displayed */
@@ -119,14 +119,14 @@
   InstallDialog  *dialog = MOKO_INSTALL_DIALOG (g_object_new (MOKO_TYPE_INSTALL_DIALOG, NULL));
   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)
     {
       gtk_widget_destroy (GTK_WIDGET (dialog));
       g_debug ("Can not malloc memory for the install dialog");
       return NULL;
     }
-  priv->prepareinfolist = (gchar *)g_malloc (sizeof(gchar *) * pkgnum);
+  priv->prepareinfolist = (gchar **)g_malloc (sizeof(gchar *) * pkgnum);
   if (priv->prepareinfolist == NULL)
     {
       gtk_widget_destroy (GTK_WIDGET (dialog));

Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/src/ipkg_cmd.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/ipkg_cmd.h	2007-03-20 03:50:56 UTC (rev 1421)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/ipkg_cmd.h	2007-03-20 05:42:10 UTC (rev 1422)
@@ -29,7 +29,7 @@
 /*
  * @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);
 
 /*
  * @brief See libipkg.a document.

Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/src/ipkgapi.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/ipkgapi.c	2007-03-20 03:50:56 UTC (rev 1421)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/ipkgapi.c	2007-03-20 05:42:10 UTC (rev 1422)
@@ -905,7 +905,7 @@
  * @retval !=0 failure.
  *         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;
     int  err = 0;

Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/src/ipkgapi.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/ipkgapi.h	2007-03-20 03:50:56 UTC (rev 1421)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/ipkgapi.h	2007-03-20 05:42:10 UTC (rev 1422)
@@ -84,7 +84,7 @@
 
 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);
 

Modified: trunk/src/target/OM-2007/applications/openmoko-appmanager/src/package-list.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-appmanager/src/package-list.c	2007-03-20 03:50:56 UTC (rev 1421)
+++ trunk/src/target/OM-2007/applications/openmoko-appmanager/src/package-list.c	2007-03-20 05:42:10 UTC (rev 1422)
@@ -82,8 +82,8 @@
         }
       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;
 
       vc = *val;
@@ -232,7 +232,7 @@
  */
 static gint 
 package_list_search_section_node (const char *name, 
-                                  SectionList *section, 
+                                  SectionList **section, 
                                   SectionList *sechead)
 {
   SectionList  *tmp;





More information about the commitlog mailing list