aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--awkgram.c6
-rw-r--r--awkgram.y6
-rw-r--r--builtin.c2
-rw-r--r--debug.c2
5 files changed, 21 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 910c8a96..bc3aca64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Mon Jan 17 22:48:48 2011 Arnold D. Robbins <arnold@skeeve.com>
+
+ * builtin.c (do_bindtextdomain): Change type of `the_result'
+ to const char* to kill compiler warnings.
+ * debug.c (source_find): Improve error message when file not
+ found.
+ * awkgram.y (get_src_buf): Add cast to value of `read' to
+ turn off compiler warnings on different systems.
+
Mon Jan 10 21:40:05 2011 Andreas Buening <andreas.buening@nexgo.de>
* io.c (devopen): Handle opening of directories for OS/2.
diff --git a/awkgram.c b/awkgram.c
index cfed73cd..24707054 100644
--- a/awkgram.c
+++ b/awkgram.c
@@ -5043,7 +5043,11 @@ get_src_buf()
/* If necessary, one day, test value for different functions. */
if (cp == NULL)
- readfunc = read;
+ /*
+ * cast is to remove warnings on systems with
+ * different return types for read.
+ */
+ readfunc = ( ssize_t(*)() ) read;
else
readfunc = read_one_line;
}
diff --git a/awkgram.y b/awkgram.y
index cc203cf3..49eab2ae 100644
--- a/awkgram.y
+++ b/awkgram.y
@@ -2394,7 +2394,11 @@ get_src_buf()
/* If necessary, one day, test value for different functions. */
if (cp == NULL)
- readfunc = read;
+ /*
+ * cast is to remove warnings on systems with
+ * different return types for read.
+ */
+ readfunc = ( ssize_t(*)() ) read;
else
readfunc = read_one_line;
}
diff --git a/builtin.c b/builtin.c
index 7ae109e7..32d97a51 100644
--- a/builtin.c
+++ b/builtin.c
@@ -2385,7 +2385,7 @@ do_bindtextdomain(int nargs)
{
NODE *t1, *t2;
const char *directory, *domain;
- char *the_result;
+ const char *the_result;
t1 = t2 = NULL;
/* set defaults */
diff --git a/debug.c b/debug.c
index 3537350e..bbaf5ae5 100644
--- a/debug.c
+++ b/debug.c
@@ -500,7 +500,7 @@ source_find(char *src)
}
}
- d_error(_("No source file named `%s' (%s)"), src, strerror(errno_val));
+ d_error(_("cannot find source file named `%s' (%s)"), src, strerror(errno_val));
return NULL;
}