Changeset 4434

Timestamp:

05/14/08 13:00:10 (5 years ago)

Author:

thomas

Message:

opkg: add some error codes to libopkg

Location:

trunk/src/target/opkg

Files:

• configure.ac (modified) (1 diff)
• libopkg/opkg.c (modified) (11 diffs)
• libopkg/opkg.h (modified) (1 diff)

trunk/src/target/opkg/configure.ac

@@ -1 +1 @@
 # Process this file with autoconf to produce a configure script
 AC_INIT(libopkg/libopkg.c)
-AM_INIT_AUTOMAKE([opkg], [0.1.3])
+AM_INIT_AUTOMAKE([opkg], [0.1.4])
 AM_CONFIG_HEADER(libopkg/config.h)
 

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

@@ -379 +379 @@
   {
     /* XXX: Error: Package is already installed. */
-    return 1;
+    return OPKG_PACKAGE_ALREADY_INSTALLED;
   }
 
@@ -386 +386 @@
   {
     /* XXX: Error: Could not find package to install */
-    return 1;
+    return OPKG_PACKAGE_NOT_FOUND;
   }
 
@@ -404 +404 @@
     /* XXX: Error: Could not satisfy dependencies */
     pkg_vec_free (deps);
-    return 1;
+    return OPKG_DEPENDANCIES_FAILED;
   }
 
@@ -428 +428 @@
     {
       /* XXX: Error: Package not available from any configured src */
-      return 1;
+      return OPKG_PACKAGE_NOT_AVAILABLE;
     }
 
@@ -516 +516 @@
   {
     /* XXX: Error: Package not installed. */
-    return 1;
+    return OPKG_PACKAGE_NOT_INSTALLED;
   }
 
@@ -527 +527 @@
   {
     /* XXX:  Error: Package seems to be not installed (STATUS = NOT_INSTALLED). */
-    return 1;
+    return OPKG_PACKAGE_NOT_INSTALLED;
   }
   progress (pdata, 25);
@@ -578 +578 @@
     {
       /* XXX: Error: Package not installed in default_dest */
-      return 1;
+      return OPKG_PACKAGE_NOT_INSTALLED;
     }
   }
@@ -590 +590 @@
   {
     /* XXX: Error: Package not installed */
-    return 1;
+    return OPKG_PACKAGE_NOT_INSTALLED;
   }
 
@@ -653 +653 @@
 {
   char *tmp;
-  int err;
+  int err, result = 0;
   char *lists_dir;
   pkg_src_list_elt_t *iter;
@@ -763 +763 @@
     {
       /* XXX: Error: download error */
+      result = OPKG_DOWNLOAD_FAILED;
     }
     free (url);
@@ -816 +817 @@
   free (lists_dir);
 
-  return 0;
+  return result;
 }
 

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

@@ -31 +31 @@
   OPKG_REMOVE,
   OPKG_DOWNLOAD
+};
+
+enum _opkg_error_code_t
+{
+  OPKG_NO_ERROR,
+  OPKG_UNKNOWN_ERROR,
+  OPKG_DOWNLOAD_FAILED,
+  OPKG_DEPENDANCIES_FAILED,
+  OPKG_PACKAGE_ALREADY_INSTALLED,
+  OPKG_PACKAGE_NOT_AVAILABLE,
+  OPKG_PACKAGE_NOT_FOUND,
+  OPKG_PACKAGE_NOT_INSTALLED
 };