From 4b5a5658a64bd0bfbc43877f165fad4e11017d1f Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Fri, 3 Jul 2009 20:11:01 +0200
Subject: [PATCH] Improved alignment of ./configure --help texts and avoided
 compiler warnings about unused variables with --disable-libacl

---
 configure.ac             |  6 +++---
 libisofs/aaip-os-linux.c | 17 +++++++++++++----
 libisofs/filters/gzip.c  | 16 ++++++++++------
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/configure.ac b/configure.ac
index a694b5f..31231d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -162,7 +162,7 @@ AC_ARG_ENABLE(verbose-debug,
 
 dnl ts A90123
 AC_ARG_ENABLE(libacl,
-[  --enable-libacl    Enable use of libacl by libisofs, default=yes],
+[  --enable-libacl         Enable use of libacl by libisofs, default=yes],
                , enable_libacl=yes)
 if test x$enable_libacl = xyes; then
 dnl Check whether there is libacl-devel and libacl-runtime.
@@ -178,7 +178,7 @@ AC_SUBST(LIBACL_DEF)
 
 dnl ts A90123
 AC_ARG_ENABLE(xattr,
-[  --enable-xattr     Enable use of xattr by libisofs, default=yes],
+[  --enable-xattr          Enable use of xattr by libisofs, default=yes],
                , enable_xattr=yes)
 if test x$enable_xattr = xyes; then
 dnl Check whether there is the header for Linux xattr. 
@@ -193,7 +193,7 @@ AC_SUBST(XATTR_DEF)
 
 dnl ts A90409
 AC_ARG_ENABLE(zlib,
-[  --enable-zlib     Enable use of zlib by libisofs, default=yes],
+[  --enable-zlib           Enable use of zlib by libisofs, default=yes],
                , enable_zlib=yes)
 if test x$enable_zlib = xyes; then
 dnl Check whether there is the header for zlib. 
diff --git a/libisofs/aaip-os-linux.c b/libisofs/aaip-os-linux.c
index 6296846..ba8a06e 100644
--- a/libisofs/aaip-os-linux.c
+++ b/libisofs/aaip-os-linux.c
@@ -131,13 +131,19 @@ int aaip_get_acl_text(char *path, char **text, int flag)
 int aaip_get_attr_list(char *path, size_t *num_attrs, char ***names,
                        size_t **value_lengths, char ***values, int flag)
 {
- int ret, retry= 0;
+ int ret;
  char *list= NULL;
- ssize_t list_size= 0, i, num_names= 0, value_ret;
- size_t acl_len= 0;
+ ssize_t list_size= 0, i, num_names= 0;
  unsigned char *acl= NULL;
  char *a_acl_text= NULL, *d_acl_text= NULL;
 
+#ifdef Libisofs_with_aaip_acL
+ size_t acl_len= 0;
+#endif
+#ifdef Libisofs_with_aaip_xattR
+ ssize_t value_ret, retry= 0;
+#endif
+
  if(flag & (1 << 15)) { /* Free memory */
    {ret= 1; goto ex;}
  }
@@ -375,8 +381,11 @@ int aaip_set_attr_list(char *path, size_t num_attrs, char **names,
                        size_t *value_lengths, char **values, int flag)
 {
  int ret, has_default_acl= 0;
- size_t i, consumed, acl_text_fill, list_size= 0, acl_idx= 0, h_consumed;
+ size_t i, consumed, acl_text_fill, acl_idx= 0, h_consumed;
  char *acl_text= NULL, *list= NULL;
+#ifdef Libisofs_with_aaip_xattR
+ size_t list_size= 0;
+#endif
 
 #ifdef Libisofs_with_aaip_xattR
 
diff --git a/libisofs/filters/gzip.c b/libisofs/filters/gzip.c
index deccf27..a26ffe1 100644
--- a/libisofs/filters/gzip.c
+++ b/libisofs/filters/gzip.c
@@ -70,6 +70,7 @@ typedef struct
 
 } GzipFilterRuntime;
 
+#ifdef Libisofs_with_zliB
 
 static
 int gzip_running_destroy(GzipFilterRuntime **running, int flag)
@@ -96,9 +97,7 @@ int gzip_running_new(GzipFilterRuntime **running, int flag)
     if (o == NULL) {
         return ISO_OUT_OF_MEM;
     }
-#ifdef Libisofs_with_zliB
     memset(&(o->strm), 0, sizeof(o->strm));
-#endif
     o->in_buffer = NULL;
     o->out_buffer = NULL;
     o->in_buffer_size = 0;
@@ -106,9 +105,7 @@ int gzip_running_new(GzipFilterRuntime **running, int flag)
     o->rpt = NULL;
     o->in_counter = 0;
     o->out_counter = 0;
-#ifdef Libisofs_with_zliB
     o->do_flush = Z_NO_FLUSH;
-#endif
     o->error_ret = 1;
 
     o->in_buffer_size= 2048;
@@ -123,6 +120,7 @@ failed:
     gzip_running_destroy(running, 0);
     return -1;
 }
+#endif /* Libisofs_with_zliB */
 
 
 /* ---------------------------- GzipFilterStreamData --------------------- */
@@ -164,12 +162,17 @@ typedef struct
 
 
 
+#ifdef Libisofs_with_zliB
+
 /* Each individual GzipFilterStreamData needs a unique id number. */
 /* >>> This is very suboptimal:
        The counter can rollover.
 */
 static ino_t gzip_ino_id = 0;
 
+#endif /* Libisofs_with_zliB */
+
+
 static
 int gzip_stream_uncompress(IsoStream *stream, void *buf, size_t desired);
 
@@ -571,13 +574,14 @@ int gzip_cmp_ino(IsoStream *s1, IsoStream *s2)
 /* ------------------------------------------------------------------------- */
 
 
+#ifdef Libisofs_with_zliB
+
 static
 void gzip_filter_free(FilterContext *filter)
 {
     /* no data are allocated */;
 }
 
-
 /*
  * @param flag bit1= Install a decompression filter
  */
@@ -626,7 +630,6 @@ int gzip_filter_get_filter(FilterContext *filter, IsoStream *original,
     return ISO_SUCCESS;
 }
 
-
 /* To be called by iso_file_add_filter().
  * The FilterContext input parameter is not furtherly needed for the 
  * emerging IsoStream.
@@ -672,6 +675,7 @@ int gzip_create_context(FilterContext **filter, int flag)
     return ISO_SUCCESS;
 }
 
+#endif /* Libisofs_with_zliB */
 
 /*
  * @param flag bit0= if_block_reduction rather than if_reduction