Changeset 2596 for vendor/gnumake/current/vmsify.c

Timestamp:

Jun 20, 2012, 12:44:52 AM (13 years ago)

Author:

bird

Message:

gnumake/current -> 3.82-cvs.

Location:

vendor/gnumake/current

Files:

• . (modified) (1 prop)
• vmsify.c (modified) (6 diffs)

vendor/gnumake/current/vmsify.c

@@ -1 +1 @@
 /* vmsify.c -- Module for vms <-> unix file name conversion
 Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-2007 Free Software Foundation, Inc.
+2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 This file is part of GNU Make.
 
@@ -121 +121 @@
   char *s;
 
-  INIT_DSC_CSTRING (name_dsc, name);
+  /*
+   * the string isn't changed, but there is no string descriptor with
+   * "const char *dsc$a_pointer"
+   */
+  INIT_DSC_CSTRING (name_dsc, (char *)name);
 
   stat = lib$sys_trnlog (&name_dsc, &resltlen, &reslt_dsc);
@@ -228 +232 @@
   int as_dir;
   int count;
+  const char *s;
+  const char *s1;
+  const char *s2;
 
   if (name == 0)
@@ -240 +247 @@
   if (t != 0)
     {
-      const char *s1;
-      const char *s2;
+//      const char *s1;
+//      const char *s2;
 
       if (type == 1)
@@ -273 +280 @@
   if (t != 0)
     {
-      const char *s;
-      const char *s1 = strchr (t+1, '[');
+//      const char *s;
+//      const char *s1 = strchr (t+1, '[');
+      s1 = strchr (t+1, '[');
       if (s1 == 0)
         {
@@ -389 +397 @@
           case 3:                               /* '//' at start */
             {
-            const char *s;
-            const char *s1;
+//            const char *s;
+//            const char *s1;
             char *vp;
             while (*fptr == '/')        /* collapse all '/' */