trans-decl.c, [...]: Replace all occurences of 'gfc_strlen_type_node' by 'gfc_charlen_type_node'.

fortran/
* trans-decl.c, trans-expr.c, trans-io.c, trans-types.c: Replace
all occurences of 'gfc_strlen_type_node' by
'gfc_charlen_type_node'.
* trans-types.h: Same. Also update comment accordingly.

libgfortran/
* libgfortran.h: Replace 'gfc_strlen_type' by
'gfc_charlen_type'. Update comment accordingly.
* intrinsics/args.c, intrinsics/env.c, io/io.h, io/transfer.c:
Replace all occurences of 'gfc_strlen_type' by 'gfc_charlen_type'.

From-SVN: r86828

6 files changed, 23 insertions, 16 deletions

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 49af843..ecc104e 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,10 @@
+2004-08-31  Tobias Schlueter  <tobias.schlueter@physik.uni-muenchen.de>
+
+	* libgfortran.h: Replace 'gfc_strlen_type' by
+	'gfc_charlen_type'. Update comment accordingly.
+	* intrinsics/args.c, intrinsics/env.c, io/io.h, io/transfer.c:
+	Replace all occurences of 'gfc_strlen_type' by 'gfc_charlen_type'.
+
 2004-08-31  Paul Brook  <paul@codesourcery.com>
 
 	* libgfortran.h: Add comments.
diff --git a/libgfortran/intrinsics/args.c b/libgfortran/intrinsics/args.c
index caa55d4..984fa91 100644
--- a/libgfortran/intrinsics/args.c
+++ b/libgfortran/intrinsics/args.c
@@ -29,7 +29,7 @@ Boston, MA 02111-1307, USA.  */
 /* Get a commandline argument.  */
 
 void 
-prefix(getarg_i4) (GFC_INTEGER_4 *pos, char  *val, gfc_strlen_type val_len)
+prefix(getarg_i4) (GFC_INTEGER_4 *pos, char  *val, gfc_charlen_type val_len)
 {
   int argc;
   int arglen;
@@ -55,7 +55,7 @@ prefix(getarg_i4) (GFC_INTEGER_4 *pos, char  *val, gfc_strlen_type val_len)
 /* INTEGER*8 wrapper of getarg.  */
 
 void 
-prefix(getarg_i8) (GFC_INTEGER_8 *pos, char  *val, gfc_strlen_type val_len)
+prefix(getarg_i8) (GFC_INTEGER_8 *pos, char  *val, gfc_charlen_type val_len)
 {
   GFC_INTEGER_4 pos4;
 
@@ -103,7 +103,7 @@ prefix(get_command_argument_i4) (GFC_INTEGER_4 *number,
 				 char *value, 
 				 GFC_INTEGER_4 *length, 
 				 GFC_INTEGER_4 *status, 
-				 gfc_strlen_type value_len)
+				 gfc_charlen_type value_len)
 {
   int argc, arglen = 0, stat_flag = GFC_GC_SUCCESS;
   char **argv;
@@ -155,7 +155,7 @@ prefix(get_command_argument_i8) (GFC_INTEGER_8 *number,
 				 char *value, 
 				 GFC_INTEGER_8 *length, 
 				 GFC_INTEGER_8 *status, 
-				 gfc_strlen_type value_len)
+				 gfc_charlen_type value_len)
 {
   GFC_INTEGER_4 number4;
   GFC_INTEGER_4 length4;
@@ -177,7 +177,7 @@ void
 prefix(get_command_i4) (char *command, 
 			GFC_INTEGER_4 *length, 
 			GFC_INTEGER_4 *status,
-			gfc_strlen_type command_len)
+			gfc_charlen_type command_len)
 {
   int i, argc, arglen, thisarg;
   int stat_flag = GFC_GC_SUCCESS;
@@ -237,7 +237,7 @@ void
 prefix(get_command_i8) (char *command, 
 			GFC_INTEGER_8 *length, 
 			GFC_INTEGER_8 *status,
-			gfc_strlen_type command_len)
+			gfc_charlen_type command_len)
 {
   GFC_INTEGER_4 length4;
   GFC_INTEGER_4 status4;
diff --git a/libgfortran/intrinsics/env.c b/libgfortran/intrinsics/env.c
index 9898471..6695d5b 100644
--- a/libgfortran/intrinsics/env.c
+++ b/libgfortran/intrinsics/env.c
@@ -34,8 +34,8 @@ Boston, MA 02111-1307, USA.  */
 void 
 prefix(getenv) (char * name, 
 		char * value, 
-		gfc_strlen_type name_len, 
-		gfc_strlen_type value_len)
+		gfc_charlen_type name_len, 
+		gfc_charlen_type value_len)
 {
 
   /* Make a null-terminated copy of the name string so that c library
@@ -99,8 +99,8 @@ prefix(get_environment_variable_i4)
    GFC_INTEGER_4 *length,
    GFC_INTEGER_4 *status,
    GFC_LOGICAL_4 *trim_name,
-   gfc_strlen_type name_len,
-   gfc_strlen_type value_len)
+   gfc_charlen_type name_len,
+   gfc_charlen_type value_len)
 {
   int stat = GFC_SUCCESS, res_len = 0;
   char name_nt[name_len+1], *res;
@@ -164,8 +164,8 @@ prefix(get_environment_variable_i8)
    GFC_INTEGER_8 *length,
    GFC_INTEGER_8 *status,
    GFC_LOGICAL_8 *trim_name,
-   gfc_strlen_type name_len,
-   gfc_strlen_type value_len)
+   gfc_charlen_type name_len,
+   gfc_charlen_type value_len)
 {
   GFC_INTEGER_4 length4, status4;
   GFC_LOGICAL_4 trim_name4;
diff --git a/libgfortran/io/io.h b/libgfortran/io/io.h
index d2c15af..e910fa5 100644
--- a/libgfortran/io/io.h
+++ b/libgfortran/io/io.h
@@ -549,7 +549,7 @@ void st_set_nml_var_int (void * , char * , int , int );
 void st_set_nml_var_float (void * , char * , int , int );
 
 #define st_set_nml_var_char prefix(st_set_nml_var_char)
-void st_set_nml_var_char (void * , char * , int , int, gfc_strlen_type);
+void st_set_nml_var_char (void * , char * , int , int, gfc_charlen_type);
 
 #define st_set_nml_var_complex prefix(st_set_nml_var_complex)
 void st_set_nml_var_complex (void * , char * , int , int );
diff --git a/libgfortran/io/transfer.c b/libgfortran/io/transfer.c
index 3800d0b..5d4dcd5 100644
--- a/libgfortran/io/transfer.c
+++ b/libgfortran/io/transfer.c
@@ -1578,7 +1578,7 @@ st_set_nml_var_float (void * var_addr, char * var_name, int var_name_len,
 
 void
 st_set_nml_var_char (void * var_addr, char * var_name, int var_name_len,
-		     int kind, gfc_strlen_type string_length)
+		     int kind, gfc_charlen_type string_length)
 {
 
   st_set_nml_var (var_addr, var_name, var_name_len, kind, BT_CHARACTER,
diff --git a/libgfortran/libgfortran.h b/libgfortran/libgfortran.h
index 2819703..463cd60 100644
--- a/libgfortran/libgfortran.h
+++ b/libgfortran/libgfortran.h
@@ -91,8 +91,8 @@ typedef complex double GFC_COMPLEX_8;
    by the compiler.  */
 /* The type used of array indices, amongst other things.  */
 typedef size_t index_type;
-/* The type used for string lengths.  Nothing to do with strlen(3).  */
-typedef GFC_INTEGER_4 gfc_strlen_type;
+/* The type used for the lengths of character variables.  */
+typedef GFC_INTEGER_4 gfc_charlen_type;
 
 /* This will be 0 on little-endian machines and one on big-endian machines.  */
 #define l8_to_l4_offset prefix(l8_to_l4_offset)