[pkg-eucalyptus-commits] r191 - axis2c/trunk/debian/patches

[Brian Thomason]

Author: iamfuzz-guest
Date: 2012-04-02 18:39:07 +0000 (Mon, 02 Apr 2012)
New Revision: 191

Modified:
   axis2c/trunk/debian/patches/09-fix-gcc-4.6.patch
Log:
Modified patch to no longer throw away result returned from chdir calls which led to compilation failure


Modified: axis2c/trunk/debian/patches/09-fix-gcc-4.6.patch
===================================================================
--- axis2c/trunk/debian/patches/09-fix-gcc-4.6.patch	2012-04-02 16:50:35 UTC (rev 190)
+++ axis2c/trunk/debian/patches/09-fix-gcc-4.6.patch	2012-04-02 18:39:07 UTC (rev 191)
@@ -53,33 +53,6 @@
          }
      }
      tmp1 = resource;
---- a/util/src/dir_handler.c
-+++ b/util/src/dir_handler.c
-@@ -190,7 +190,7 @@
-     int i = 0;
-     struct dirent **files = NULL;
-     char cwd[500];
--    int chdir_result = 0;
-+    /*int chdir_result = 0;*/
- 
-     /**FIXME:
-      * This magic number 500 was selected as a temperary solution. It has to be
-@@ -205,13 +205,13 @@
-         exit(1);
- 
-     /* pathname is path of services directory or modules directory. */
--    chdir_result =  AXIS2_CHDIR(pathname);
-+    AXIS2_CHDIR(pathname);
- #ifdef AXIS2_ARCHIVE_ENABLED
-     axis2_archive_extract();
- #endif
- 
-     count = AXIS2_SCANDIR(pathname, &files, dir_select, AXIS2_ALPHASORT);
--    chdir_result = AXIS2_CHDIR(cwd);
-+    AXIS2_CHDIR(cwd);
- 
-     /* If no files found, make a non-selectable menu item */
-     if (count <= 0)
 --- a/util/test/util/test_util.c
 +++ b/util/test/util/test_util.c
 @@ -66,9 +66,9 @@