[SCM] GNU Libtool branch, master, updated. v2.2.4-13-g1113cea

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Libtool".

The branch, master has been updated
       via  1113cea29ec34b7c3cf1c0a3f2ebf1b7b05977e3 (commit)
      from  af3b8c515e1e6297294c0c5fb69998274d389653 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1113cea29ec34b7c3cf1c0a3f2ebf1b7b05977e3
Author: Ralf Wildenhues <address@hidden>
Date:   Sun May 25 23:10:42 2008 +0200

    Simplify argument parsing in cwrapper.
    
    * libltdl/config/ltmain.m4sh (func_emit_cwrapperexe_src):
    Use NULL where appropriate.  Do not compute length of arguments
    needlessly.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                  |    7 +++++++
 libltdl/config/ltmain.m4sh |   29 ++++++++++-------------------
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 276d9b6..97eea58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-26  Ralf Wildenhues  <address@hidden>
+
+       Simplify argument parsing in cwrapper.
+       * libltdl/config/ltmain.m4sh (func_emit_cwrapperexe_src):
+       Use NULL where appropriate.  Do not compute length of arguments
+       needlessly.
+
 2008-05-25  Charles Wilson  <address@hidden>
 
        [mingw] Add cross-compile support to cwrapper
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index cfdfdf9..144bc76 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -3005,7 +3005,7 @@ EOF
   /* DO want the lt- prefix here if it exists, so use target_name */
   lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);
   XFREE (tmp_pathspec);
-  tmp_pathspec = 0;
+  tmp_pathspec = NULL;
 EOF
 
            case $host_os in
@@ -3039,19 +3039,16 @@ EOF
   newargc=0;
   for (i = 1; i < argc; i++)
     {
-      size_t arglen = strlen (argv[i]);
       if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)
         {
-          if ((arglen > env_set_opt_len) && (argv[i][env_set_opt_len] == '='))
+          if (argv[i][env_set_opt_len] == '=')
             {
               const char *p = argv[i] + env_set_opt_len + 1;
               lt_opt_process_env_set (p);
             }
-          else if ((arglen == env_set_opt_len) &&
-                   (i + 1 < argc))
+          else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)
             {
-              lt_opt_process_env_set (argv[i + 1]);
-              i++; /* don't copy */
+              lt_opt_process_env_set (argv[++i]); /* don't copy */
             }
           else
             lt_fatal ("%s missing required argument", env_set_opt);
@@ -3059,17 +3056,14 @@ EOF
         }
       if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)
         {
-          if ((arglen > env_prepend_opt_len) &&
-              (argv[i][env_prepend_opt_len] == '='))
+          if (argv[i][env_prepend_opt_len] == '=')
             {
               const char *p = argv[i] + env_prepend_opt_len + 1;
               lt_opt_process_env_prepend (p);
             }
-          else if ((arglen == env_prepend_opt_len) &&
-                   (i + 1 < argc))
+          else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)
             {
-              lt_opt_process_env_prepend (argv[i + 1]);
-              i++; /* don't copy */
+              lt_opt_process_env_prepend (argv[++i]); /* don't copy */
             }
           else
             lt_fatal ("%s missing required argument", env_prepend_opt);
@@ -3077,17 +3071,14 @@ EOF
         }
       if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)
         {
-          if ((arglen > env_append_opt_len) &&
-              (argv[i][env_append_opt_len] == '='))
+          if (argv[i][env_append_opt_len] == '=')
             {
               const char *p = argv[i] + env_append_opt_len + 1;
               lt_opt_process_env_append (p);
             }
-          else if ((arglen == env_append_opt_len) &&
-                   (i + 1 < argc))
+          else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)
             {
-              lt_opt_process_env_append (argv[i + 1]);
-              i++; /* don't copy */
+              lt_opt_process_env_append (argv[++i]); /* don't copy */
             }
           else
             lt_fatal ("%s missing required argument", env_append_opt);


hooks/post-receive
--
GNU Libtool