Change getline and getdelim return type to ssize_t.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 54eb58b77c4a0086a0e0a6f0a87d8d261a0534f1..8ea91f71bfdc7bae0aadd190ec2f1a83630cd934 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,11 @@
+2003-07-24  Derek Robert Price  <derek@ximbiot.com>
+            Bruno Haible  <bruno@clisp.org>
+
+       * getline.h (getline, getdelim): Change return type to ssize_t.
+       * getline.c (getline, getdelim): Likewise.
+       Remove _GNU_SOURCE define; now it's defined in config.h through
+       m4/getline.m4.
+
 2003-07-22  Paul Eggert  <eggert@twinsun.com>
 
        * xalloc.h (XCALLOC, XREALLOC, CCLONE): Fix under- and

diff --git a/lib/getline.c b/lib/getline.c
index 6cd9503277fd48bd1b6de6154ee5382392ca5b4e..a4d09ea6b08ab3b698c8058b89614501bb45bb80 100644 (file)
--- a/lib/getline.c
+++ b/lib/getline.c
@@ -26,18 +26,15 @@
 /* Specification.  */
 #include "getline.h"
 
-/* The `getdelim' function is only declared if the following symbol
-   is defined.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif
-
 #include <stddef.h>
 #include <stdio.h>
 
+/* Get ssize_t.  */
+#include <sys/types.h>
+
 #if defined __GNU_LIBRARY__ && HAVE_GETDELIM
 
-int
+ssize_t
 getline (char **lineptr, size_t *linesize, FILE *stream)
 {
   return getdelim (lineptr, linesize, '\n', stream);
@@ -47,13 +44,13 @@ getline (char **lineptr, size_t *linesize, FILE *stream)
 
 #include "getndelim2.h"
 
-int
+ssize_t
 getline (char **lineptr, size_t *linesize, FILE *stream)
 {
   return getndelim2 (lineptr, linesize, (size_t)(-1), stream, '\n', 0, 0);
 }
 
-int
+ssize_t
 getdelim (char **lineptr, size_t *linesize, int delimiter, FILE *stream)
 {
   return getndelim2 (lineptr, linesize, (size_t)(-1), stream, delimiter, 0, 0);

diff --git a/lib/getline.h b/lib/getline.h
index 0bf8a2552bf649c1cf6780aa56b172fe52a864f3..ee9fc052c129058525a50c11a2579e03d5add869 100644 (file)
--- a/lib/getline.h
+++ b/lib/getline.h
@@ -23,13 +23,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 # include <stddef.h>
 # include <stdio.h>
 
+/* Get ssize_t.  */
+# include <sys/types.h>
+
 /* glibc2 has these functions declared in <stdio.h>.  Avoid redeclarations.  */
 # if __GLIBC__ < 2
 
-extern int getline (char **_lineptr, size_t *_linesize, FILE *_stream);
+extern ssize_t getline (char **_lineptr, size_t *_linesize, FILE *_stream);
 
-extern int getdelim (char **_lineptr, size_t *_linesize, int _delimiter,
-                    FILE *_stream);
+extern ssize_t getdelim (char **_lineptr, size_t *_linesize, int _delimiter,
+                         FILE *_stream);
 
 # endif