aboutsummaryrefslogtreecommitdiff
path: root/libgfortran/runtime
diff options
context:
space:
mode:
Diffstat (limited to 'libgfortran/runtime')
-rw-r--r--libgfortran/runtime/environ.c33
-rw-r--r--libgfortran/runtime/error.c48
-rw-r--r--libgfortran/runtime/string.c2
3 files changed, 42 insertions, 41 deletions
diff --git a/libgfortran/runtime/environ.c b/libgfortran/runtime/environ.c
index 28cf589..62e4cfa 100644
--- a/libgfortran/runtime/environ.c
+++ b/libgfortran/runtime/environ.c
@@ -460,17 +460,18 @@ show_signal (variable * v)
static variable variable_table[] = {
- {"GFORTRAN_STDIN_UNIT", 5, &options.stdin_unit, init_integer, show_integer,
+ {"GFORTRAN_STDIN_UNIT", GFC_STDIN_UNIT_NUMBER, &options.stdin_unit,
+ init_integer, show_integer,
"Unit number that will be preconnected to standard input\n"
"(No preconnection if negative)", 0},
- {"GFORTRAN_STDOUT_UNIT", 6, &options.stdout_unit, init_integer,
- show_integer,
+ {"GFORTRAN_STDOUT_UNIT", GFC_STDOUT_UNIT_NUMBER, &options.stdout_unit,
+ init_integer, show_integer,
"Unit number that will be preconnected to standard output\n"
"(No preconnection if negative)", 0},
- {"GFORTRAN_STDERR_UNIT", 0, &options.stderr_unit, init_integer,
- show_integer,
+ {"GFORTRAN_STDERR_UNIT", GFC_STDERR_UNIT_NUMBER, &options.stderr_unit,
+ init_integer, show_integer,
"Unit number that will be preconnected to standard error\n"
"(No preconnection if negative)", 0},
@@ -622,7 +623,7 @@ show_variables (void)
st_printf ("\nRuntime error codes:");
st_printf ("\n--------------------\n");
- for (n = ERROR_FIRST + 1; n < ERROR_LAST; n++)
+ for (n = LIBERROR_FIRST + 1; n < LIBERROR_LAST; n++)
if (n < 0 || n > 9)
st_printf ("%d %s\n", n, translate_error (n));
else
@@ -881,19 +882,19 @@ do_parse (void)
switch (tok)
{
case NATIVE:
- endian = CONVERT_NATIVE;
+ endian = GFC_CONVERT_NATIVE;
break;
case SWAP:
- endian = CONVERT_SWAP;
+ endian = GFC_CONVERT_SWAP;
break;
case BIG:
- endian = CONVERT_BIG;
+ endian = GFC_CONVERT_BIG;
break;
case LITTLE:
- endian = CONVERT_LITTLE;
+ endian = GFC_CONVERT_LITTLE;
break;
case INTEGER:
@@ -948,25 +949,25 @@ do_parse (void)
case NATIVE:
if (next_token () != ':')
goto error;
- endian = CONVERT_NATIVE;
+ endian = GFC_CONVERT_NATIVE;
break;
case SWAP:
if (next_token () != ':')
goto error;
- endian = CONVERT_SWAP;
+ endian = GFC_CONVERT_SWAP;
break;
case LITTLE:
if (next_token () != ':')
goto error;
- endian = CONVERT_LITTLE;
+ endian = GFC_CONVERT_LITTLE;
break;
case BIG:
if (next_token () != ':')
goto error;
- endian = CONVERT_BIG;
+ endian = GFC_CONVERT_BIG;
break;
case INTEGER:
@@ -1034,7 +1035,7 @@ do_parse (void)
end:
return 0;
error:
- def = CONVERT_NONE;
+ def = GFC_CONVERT_NONE;
return -1;
}
@@ -1042,7 +1043,7 @@ void init_unformatted (variable * v)
{
char *val;
val = getenv (v->name);
- def = CONVERT_NONE;
+ def = GFC_CONVERT_NONE;
n_elist = 0;
if (val == NULL)
diff --git a/libgfortran/runtime/error.c b/libgfortran/runtime/error.c
index 9aa7cd8..279e265 100644
--- a/libgfortran/runtime/error.c
+++ b/libgfortran/runtime/error.c
@@ -310,83 +310,83 @@ translate_error (int code)
switch (code)
{
- case ERROR_EOR:
+ case LIBERROR_EOR:
p = "End of record";
break;
- case ERROR_END:
+ case LIBERROR_END:
p = "End of file";
break;
- case ERROR_OK:
+ case LIBERROR_OK:
p = "Successful return";
break;
- case ERROR_OS:
+ case LIBERROR_OS:
p = "Operating system error";
break;
- case ERROR_BAD_OPTION:
+ case LIBERROR_BAD_OPTION:
p = "Bad statement option";
break;
- case ERROR_MISSING_OPTION:
+ case LIBERROR_MISSING_OPTION:
p = "Missing statement option";
break;
- case ERROR_OPTION_CONFLICT:
+ case LIBERROR_OPTION_CONFLICT:
p = "Conflicting statement options";
break;
- case ERROR_ALREADY_OPEN:
+ case LIBERROR_ALREADY_OPEN:
p = "File already opened in another unit";
break;
- case ERROR_BAD_UNIT:
+ case LIBERROR_BAD_UNIT:
p = "Unattached unit";
break;
- case ERROR_FORMAT:
+ case LIBERROR_FORMAT:
p = "FORMAT error";
break;
- case ERROR_BAD_ACTION:
+ case LIBERROR_BAD_ACTION:
p = "Incorrect ACTION specified";
break;
- case ERROR_ENDFILE:
+ case LIBERROR_ENDFILE:
p = "Read past ENDFILE record";
break;
- case ERROR_BAD_US:
+ case LIBERROR_BAD_US:
p = "Corrupt unformatted sequential file";
break;
- case ERROR_READ_VALUE:
+ case LIBERROR_READ_VALUE:
p = "Bad value during read";
break;
- case ERROR_READ_OVERFLOW:
+ case LIBERROR_READ_OVERFLOW:
p = "Numeric overflow on read";
break;
- case ERROR_INTERNAL:
+ case LIBERROR_INTERNAL:
p = "Internal error in run-time library";
break;
- case ERROR_INTERNAL_UNIT:
+ case LIBERROR_INTERNAL_UNIT:
p = "Internal unit I/O error";
break;
- case ERROR_DIRECT_EOR:
+ case LIBERROR_DIRECT_EOR:
p = "Write exceeds length of DIRECT access record";
break;
- case ERROR_SHORT_RECORD:
+ case LIBERROR_SHORT_RECORD:
p = "I/O past end of record on unformatted file";
break;
- case ERROR_CORRUPT_FILE:
+ case LIBERROR_CORRUPT_FILE:
p = "Unformatted file structure has been corrupted";
break;
@@ -412,11 +412,11 @@ generate_error (st_parameter_common *cmp, int family, const char *message)
{
/* Set the error status. */
if ((cmp->flags & IOPARM_HAS_IOSTAT))
- *cmp->iostat = (family == ERROR_OS) ? errno : family;
+ *cmp->iostat = (family == LIBERROR_OS) ? errno : family;
if (message == NULL)
message =
- (family == ERROR_OS) ? get_oserror () : translate_error (family);
+ (family == LIBERROR_OS) ? get_oserror () : translate_error (family);
if (cmp->flags & IOPARM_HAS_IOMSG)
cf_strcpy (cmp->iomsg, cmp->iomsg_len, message);
@@ -425,13 +425,13 @@ generate_error (st_parameter_common *cmp, int family, const char *message)
cmp->flags &= ~IOPARM_LIBRETURN_MASK;
switch (family)
{
- case ERROR_EOR:
+ case LIBERROR_EOR:
cmp->flags |= IOPARM_LIBRETURN_EOR;
if ((cmp->flags & IOPARM_EOR))
return;
break;
- case ERROR_END:
+ case LIBERROR_END:
cmp->flags |= IOPARM_LIBRETURN_END;
if ((cmp->flags & IOPARM_END))
return;
diff --git a/libgfortran/runtime/string.c b/libgfortran/runtime/string.c
index 9dfda2b..ee7bcfb 100644
--- a/libgfortran/runtime/string.c
+++ b/libgfortran/runtime/string.c
@@ -122,7 +122,7 @@ find_option (st_parameter_common *cmp, const char *s1, gfc_charlen_type s1_len,
if (compare0 (s1, s1_len, opts->name))
return opts->value;
- generate_error (cmp, ERROR_BAD_OPTION, error_message);
+ generate_error (cmp, LIBERROR_BAD_OPTION, error_message);
return -1;
}
generated by cgit v1.1 at 2025-05-15 17:04:33 +0000