Use 'case' statements instead of 'expr' invocations.

diff --git a/ChangeLog b/ChangeLog
index 9fcb2f9b23a3af5af1312b6521c386f7d404b0cf..41bc514c91fdeaed6d2bf1a2ae0d3cc80055eb06 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2007-03-08  Bruno Haible  <bruno@clisp.org>
+
+       * m4/snprintf-posix.m4 (gl_FUNC_SNPRINTF_POSIX): Use 'case' statements
+       instead of 'expr' invocations.
+       * m4/sprintf-posix.m4 (gl_FUNC_SPRINTF_POSIX): Likewise.
+       * m4/vasnprintf-posix.m4 (gl_FUNC_VASNPRINTF_POSIX): Likewise.
+       * m4/vasprintf-posix.m4 (gl_FUNC_VASPRINTF_POSIX): Likewise.
+       * m4/vsnprintf-posix.m4 (gl_FUNC_VSNPRINTF_POSIX): Likewise.
+       * m4/vsprintf-posix.m4 (gl_FUNC_VSPRINTF_POSIX): Likewise.
+       Suggested by Paul Eggert.
+
 2007-03-08  Bruno Haible  <bruno@clisp.org>
 
        * modules/fseterr-tests: New file.

diff --git a/m4/snprintf-posix.m4 b/m4/snprintf-posix.m4
index 44c0dbf8aef8a3c763cb106ad2e2b97fa98d5714..d1f889ed88a2b9d86ff3c16d85986b5f72ceac9e 100644 (file)
--- a/m4/snprintf-posix.m4
+++ b/m4/snprintf-posix.m4
@@ -17,16 +17,37 @@ AC_DEFUN([gl_FUNC_SNPRINTF_POSIX],
     gl_SNPRINTF_TRUNCATION_C99
     gl_SNPRINTF_RETVAL_C99
     gl_SNPRINTF_DIRECTIVE_N
-    if expr "$gl_cv_func_printf_sizes_c99" : ".*yes" > /dev/null \
-       && expr "$gl_cv_func_printf_directive_a" : ".*yes" > /dev/null \
-       && expr "$gl_cv_func_printf_directive_n" : ".*yes" > /dev/null \
-       && expr "$gl_cv_func_printf_positions" : ".*yes" > /dev/null \
-       && expr "$gl_cv_func_snprintf_truncation_c99" : ".*yes" > /dev/null \
-       && expr "$gl_cv_func_snprintf_retval_c99" : ".*yes" > /dev/null \
-       && expr "$gl_cv_func_snprintf_directive_n" : ".*yes" > /dev/null; then
-      # snprintf exists and is already POSIX compliant.
-      gl_cv_func_snprintf_posix=yes
-    fi
+    case "$gl_cv_func_printf_sizes_c99" in
+      *yes)
+        case "$gl_cv_func_printf_directive_a" in
+          *yes)
+            case "$gl_cv_func_printf_directive_n" in
+              *yes)
+                case "$gl_cv_func_printf_positions" in
+                  *yes)
+                    case "$gl_cv_func_snprintf_truncation_c99" in
+                      *yes)
+                        case "$gl_cv_func_snprintf_retval_c99" in
+                          *yes)
+                            case "$gl_cv_func_snprintf_directive_n" in
+                              *yes)
+                                # snprintf exists and is already POSIX
+                                # compliant.
+                                gl_cv_func_snprintf_posix=yes
+                                ;;
+                            esac
+                            ;;
+                        esac
+                        ;;
+                    esac
+                    ;;
+                esac
+                ;;
+            esac
+            ;;
+        esac
+        ;;
+    esac
   fi
   if test $gl_cv_func_snprintf_posix = no; then
     if ! expr "$gl_cv_func_printf_directive_a" : ".*yes" > /dev/null; then

diff --git a/m4/sprintf-posix.m4 b/m4/sprintf-posix.m4
index bd28762ec868755ebb10b5f2b5b601d815b4c22d..99321940f56a349340ed1d02aba48a4743445467 100644 (file)
--- a/m4/sprintf-posix.m4
+++ b/m4/sprintf-posix.m4
@@ -11,12 +11,26 @@ AC_DEFUN([gl_FUNC_SPRINTF_POSIX],
   AC_REQUIRE([gl_PRINTF_DIRECTIVE_A])
   AC_REQUIRE([gl_PRINTF_DIRECTIVE_N])
   AC_REQUIRE([gl_PRINTF_POSITIONS])
-  if expr "$gl_cv_func_printf_sizes_c99" : ".*yes" > /dev/null \
-     && expr "$gl_cv_func_printf_directive_a" : ".*yes" > /dev/null \
-     && expr "$gl_cv_func_printf_directive_n" : ".*yes" > /dev/null \
-     && expr "$gl_cv_func_printf_positions" : ".*yes" > /dev/null; then
-    : # sprintf exists and is already POSIX compliant.
-  else
+  gl_cv_func_sprintf_posix=no
+  case "$gl_cv_func_printf_sizes_c99" in
+    *yes)
+      case "$gl_cv_func_printf_directive_a" in
+        *yes)
+          case "$gl_cv_func_printf_directive_n" in
+            *yes)
+              case "$gl_cv_func_printf_positions" in
+                *yes)
+                  # sprintf exists and is already POSIX compliant.
+                  gl_cv_func_sprintf_posix=yes
+                  ;;
+              esac
+              ;;
+          esac
+          ;;
+      esac
+      ;;
+  esac
+  if test $gl_cv_func_sprintf_posix = no; then
     if ! expr "$gl_cv_func_printf_directive_a" : ".*yes" > /dev/null; then
       AC_DEFINE([NEED_PRINTF_DIRECTIVE_A], 1,
         [Define if the vasnprintf implementation needs special code for

diff --git a/m4/vasnprintf-posix.m4 b/m4/vasnprintf-posix.m4
index a79a267063e3ad4187ad498feaf1a34fc6395549..ea282a1bb305c22cdbf49d959fcada4a1e471ab4 100644 (file)
--- a/m4/vasnprintf-posix.m4
+++ b/m4/vasnprintf-posix.m4
@@ -11,14 +11,29 @@ AC_DEFUN([gl_FUNC_VASNPRINTF_POSIX],
   AC_REQUIRE([gl_PRINTF_DIRECTIVE_A])
   AC_REQUIRE([gl_PRINTF_DIRECTIVE_N])
   AC_REQUIRE([gl_PRINTF_POSITIONS])
+  gl_cv_func_vasnprintf_posix=no
   AC_CHECK_FUNCS_ONCE([vasnprintf])
-  if expr "$gl_cv_func_printf_sizes_c99" : ".*yes" > /dev/null \
-     && expr "$gl_cv_func_printf_directive_a" : ".*yes" > /dev/null \
-     && expr "$gl_cv_func_printf_directive_n" : ".*yes" > /dev/null \
-     && expr "$gl_cv_func_printf_positions" : ".*yes" > /dev/null \
-     && test $ac_cv_func_vasnprintf = yes; then
-    : # vasnprintf exists and is already POSIX compliant.
-  else
+  case "$gl_cv_func_printf_sizes_c99" in
+    *yes)
+      case "$gl_cv_func_printf_directive_a" in
+        *yes)
+          case "$gl_cv_func_printf_directive_n" in
+            *yes)
+              case "$gl_cv_func_printf_positions" in
+                *yes)
+                  if test $ac_cv_func_vasnprintf = yes; then
+                    # vasnprintf exists and is already POSIX compliant.
+                    gl_cv_func_vasnprintf_posix=yes
+                  fi
+                  ;;
+              esac
+              ;;
+          esac
+          ;;
+      esac
+      ;;
+  esac
+  if test $gl_cv_func_vasnprintf_posix = no; then
     if ! expr "$gl_cv_func_printf_directive_a" : ".*yes" > /dev/null; then
       AC_DEFINE([NEED_PRINTF_DIRECTIVE_A], 1,
         [Define if the vasnprintf implementation needs special code for

diff --git a/m4/vasprintf-posix.m4 b/m4/vasprintf-posix.m4
index 6c5fc58acd8ddbeb7806bfdbf233dbeb1f05c725..079ac768bcae60c0848a9529769206d0f5b731c3 100644 (file)
--- a/m4/vasprintf-posix.m4
+++ b/m4/vasprintf-posix.m4
@@ -11,14 +11,29 @@ AC_DEFUN([gl_FUNC_VASPRINTF_POSIX],
   AC_REQUIRE([gl_PRINTF_DIRECTIVE_A])
   AC_REQUIRE([gl_PRINTF_DIRECTIVE_N])
   AC_REQUIRE([gl_PRINTF_POSITIONS])
+  gl_cv_func_vasprintf_posix=no
   AC_CHECK_FUNCS([vasprintf])
-  if expr "$gl_cv_func_printf_sizes_c99" : ".*yes" > /dev/null \
-     && expr "$gl_cv_func_printf_directive_a" : ".*yes" > /dev/null \
-     && expr "$gl_cv_func_printf_directive_n" : ".*yes" > /dev/null \
-     && expr "$gl_cv_func_printf_positions" : ".*yes" > /dev/null \
-     && test $ac_cv_func_vasprintf = yes; then
-    : # vasprintf exists and is already POSIX compliant.
-  else
+  case "$gl_cv_func_printf_sizes_c99" in
+    *yes)
+      case "$gl_cv_func_printf_directive_a" in
+        *yes)
+          case "$gl_cv_func_printf_directive_n" in
+            *yes)
+              case "$gl_cv_func_printf_positions" in
+                *yes)
+                  if test $ac_cv_func_vasprintf = yes; then
+                    # vasprintf exists and is already POSIX compliant.
+                    gl_cv_func_vasprintf_posix=yes
+                  fi
+                  ;;
+              esac
+              ;;
+          esac
+          ;;
+      esac
+      ;;
+  esac
+  if test $gl_cv_func_vasprintf_posix = no; then
     if ! expr "$gl_cv_func_printf_directive_a" : ".*yes" > /dev/null; then
       AC_DEFINE([NEED_PRINTF_DIRECTIVE_A], 1,
         [Define if the vasnprintf implementation needs special code for

diff --git a/m4/vsnprintf-posix.m4 b/m4/vsnprintf-posix.m4
index dcf039732825e0673563b8ea157e2ff73942d140..c90ad8ef2e4a402695ffd534a9115a25abe3b555 100644 (file)
--- a/m4/vsnprintf-posix.m4
+++ b/m4/vsnprintf-posix.m4
@@ -18,16 +18,37 @@ AC_DEFUN([gl_FUNC_VSNPRINTF_POSIX],
     gl_SNPRINTF_TRUNCATION_C99
     gl_SNPRINTF_RETVAL_C99
     gl_SNPRINTF_DIRECTIVE_N
-    if expr "$gl_cv_func_printf_sizes_c99" : ".*yes" > /dev/null \
-       && expr "$gl_cv_func_printf_directive_a" : ".*yes" > /dev/null \
-       && expr "$gl_cv_func_printf_directive_n" : ".*yes" > /dev/null \
-       && expr "$gl_cv_func_printf_positions" : ".*yes" > /dev/null \
-       && expr "$gl_cv_func_snprintf_truncation_c99" : ".*yes" > /dev/null \
-       && expr "$gl_cv_func_snprintf_retval_c99" : ".*yes" > /dev/null \
-       && expr "$gl_cv_func_snprintf_directive_n" : ".*yes" > /dev/null; then
-      # vsnprintf exists and is already POSIX compliant.
-      gl_cv_func_vsnprintf_posix=yes
-    fi
+    case "$gl_cv_func_printf_sizes_c99" in
+      *yes)
+        case "$gl_cv_func_printf_directive_a" in
+          *yes)
+            case "$gl_cv_func_printf_directive_n" in
+              *yes)
+                case "$gl_cv_func_printf_positions" in
+                  *yes)
+                    case "$gl_cv_func_snprintf_truncation_c99" in
+                      *yes)
+                        case "$gl_cv_func_snprintf_retval_c99" in
+                          *yes)
+                            case "$gl_cv_func_snprintf_directive_n" in
+                              *yes)
+                                # vsnprintf exists and is already POSIX
+                                # compliant.
+                                gl_cv_func_vsnprintf_posix=yes
+                                ;;
+                            esac
+                            ;;
+                        esac
+                        ;;
+                    esac
+                    ;;
+                esac
+                ;;
+            esac
+            ;;
+        esac
+        ;;
+    esac
   fi
   if test $gl_cv_func_vsnprintf_posix = no; then
     if ! expr "$gl_cv_func_printf_directive_a" : ".*yes" > /dev/null; then

diff --git a/m4/vsprintf-posix.m4 b/m4/vsprintf-posix.m4
index 580bc1c20d9b7cf2444f329c44880d99461e3101..ef5d2e8a196a6217a89917f93f7e1cc30c7142b0 100644 (file)
--- a/m4/vsprintf-posix.m4
+++ b/m4/vsprintf-posix.m4
@@ -11,12 +11,26 @@ AC_DEFUN([gl_FUNC_VSPRINTF_POSIX],
   AC_REQUIRE([gl_PRINTF_DIRECTIVE_A])
   AC_REQUIRE([gl_PRINTF_DIRECTIVE_N])
   AC_REQUIRE([gl_PRINTF_POSITIONS])
-  if expr "$gl_cv_func_printf_sizes_c99" : ".*yes" > /dev/null \
-     && expr "$gl_cv_func_printf_directive_a" : ".*yes" > /dev/null \
-     && expr "$gl_cv_func_printf_directive_n" : ".*yes" > /dev/null \
-     && expr "$gl_cv_func_printf_positions" : ".*yes" > /dev/null; then
-    : # vsprintf exists and is already POSIX compliant.
-  else
+  gl_cv_func_vsprintf_posix=no
+  case "$gl_cv_func_printf_sizes_c99" in
+    *yes)
+      case "$gl_cv_func_printf_directive_a" in
+        *yes)
+          case "$gl_cv_func_printf_directive_n" in
+            *yes)
+              case "$gl_cv_func_printf_positions" in
+                *yes)
+                  # vsprintf exists and is already POSIX compliant.
+                  gl_cv_func_vsprintf_posix=yes
+                  ;;
+              esac
+              ;;
+          esac
+          ;;
+      esac
+      ;;
+  esac
+  if test $gl_cv_func_vsprintf_posix = no; then
     if ! expr "$gl_cv_func_printf_directive_a" : ".*yes" > /dev/null; then
       AC_DEFINE([NEED_PRINTF_DIRECTIVE_A], 1,
         [Define if the vasnprintf implementation needs special code for