aboutsummaryrefslogtreecommitdiffstats
path: root/error.c
diff options
context:
space:
mode:
authorJari Aalto <jari.aalto@cante.net>2001-11-13 17:56:06 +0000
committerJari Aalto <jari.aalto@cante.net>2009-09-12 16:46:54 +0000
commitf73dda092b33638d2d5e9c35375f687a607b5403 (patch)
treef21584e70a444d6a1ecba0fb5e2cf79e8cce91db /error.c
parent28ef6c316f1aff914bb95ac09787a3c83c1815fd (diff)
downloadandroid_external_bash-f73dda092b33638d2d5e9c35375f687a607b5403.tar.gz
android_external_bash-f73dda092b33638d2d5e9c35375f687a607b5403.tar.bz2
android_external_bash-f73dda092b33638d2d5e9c35375f687a607b5403.zip
Imported from ../bash-2.05a.tar.gz.
Diffstat (limited to 'error.c')
-rw-r--r--error.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/error.c b/error.c
index 689f13d..68ea548 100644
--- a/error.c
+++ b/error.c
@@ -58,7 +58,7 @@ extern char *dollar_vars[];
extern char *shell_name;
#if defined (JOB_CONTROL)
extern pid_t shell_pgrp;
-extern int give_terminal_to ();
+extern int give_terminal_to __P((pid_t, int));
#endif /* JOB_CONTROL */
/* The current maintainer of the shell. You change this in the
@@ -95,7 +95,7 @@ get_name_for_error ()
format string. */
void
file_error (filename)
- char *filename;
+ const char *filename;
{
report_error ("%s: %s", filename, strerror (errno));
}
@@ -227,7 +227,7 @@ programming_error (format, va_alist)
char *h;
#if defined (JOB_CONTROL)
- give_terminal_to (shell_pgrp);
+ give_terminal_to (shell_pgrp, 0);
#endif /* JOB_CONTROL */
#if defined (PREFER_STDARG)
@@ -446,7 +446,7 @@ itrace (format, va_alist)
{
va_list args;
- fprintf(stderr, "TRACE: pid %d: ", (int)getpid());
+ fprintf(stderr, "TRACE: pid %ld: ", (long)getpid());
#if defined (PREFER_STDARG)
va_start (args, format);
@@ -484,7 +484,7 @@ trace (format, va_alist)
else
fcntl (fileno (tracefp), F_SETFD, 1); /* close-on-exec */
- fprintf(tracefp, "TRACE: pid %d: ", getpid());
+ fprintf(tracefp, "TRACE: pid %ld: ", (long)getpid());
#if defined (PREFER_STDARG)
va_start (args, format);