From cef8286228ed003c185b3111224bf0d9061d6abe Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Wed, 22 Aug 2007 14:04:30 +0000 Subject: [PATCH] * tests/test-getdelim.c (main): Use remove, not unlink. * tests/test-getline.c (main): Likewise. --- ChangeLog | 3 +++ lib/getdelim.h | 28 ---------------------------- lib/getline.h | 28 ---------------------------- tests/test-getdelim.c | 6 +++--- tests/test-getline.c | 6 +++--- 5 files changed, 9 insertions(+), 62 deletions(-) delete mode 100644 lib/getdelim.h delete mode 100644 lib/getline.h diff --git a/ChangeLog b/ChangeLog index b3e22bab3..d780a4101 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2007-08-22 Eric Blake + * tests/test-getdelim.c (main): Use remove, not unlink. + * tests/test-getline.c (main): Likewise. + Move getline and getdelim into stdio.h, per POSIX 200x. * modules/getline (Files): Remove getline.h. (Depends-on): Add stdio. diff --git a/lib/getdelim.h b/lib/getdelim.h deleted file mode 100644 index 8bc61307e..000000000 --- a/lib/getdelim.h +++ /dev/null @@ -1,28 +0,0 @@ -/* getdelim.h --- Prototype for replacement getdelim function. - Copyright (C) 2005 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2, or (at - your option) any later version. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. */ - -/* Written by Simon Josefsson. */ - -/* Get size_t, FILE, ssize_t. And getdelim, if available. */ -# include -# include -# include - -#if !HAVE_DECL_GETDELIM -ssize_t getdelim (char **lineptr, size_t *n, int delimiter, FILE *stream); -#endif /* !HAVE_GETDELIM */ diff --git a/lib/getline.h b/lib/getline.h deleted file mode 100644 index f0f61c4b2..000000000 --- a/lib/getline.h +++ /dev/null @@ -1,28 +0,0 @@ -/* getline.h --- Prototype for replacement getline function. - Copyright (C) 2005 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2, or (at - your option) any later version. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. */ - -/* Written by Simon Josefsson. */ - -/* Get size_t, FILE, ssize_t. And getline, if available. */ -# include -# include -# include - -#if !HAVE_DECL_GETLINE -ssize_t getline (char **lineptr, size_t *n, FILE *stream); -#endif /* !HAVE_GETLINE */ diff --git a/tests/test-getdelim.c b/tests/test-getdelim.c index e33099b9c..aca6d60fc 100644 --- a/tests/test-getdelim.c +++ b/tests/test-getdelim.c @@ -47,14 +47,14 @@ main (int argc, char **argv) if (!f || fwrite ("anbcnd\0f", 1, 8, f) != 8 || fclose (f) != 0) { fputs ("Failed to create sample file.\n", stderr); - unlink ("test-getdelim.txt"); + remove ("test-getdelim.txt"); return 1; } f = fopen ("test-getdelim.txt", "rb"); if (!f) { fputs ("Failed to reopen sample file.\n", stderr); - unlink ("test-getdelim.txt"); + remove ("test-getdelim.txt"); return 1; } @@ -84,6 +84,6 @@ main (int argc, char **argv) free (line); fclose (f); - unlink ("test-getdelim.txt"); + remove ("test-getdelim.txt"); return 0; } diff --git a/tests/test-getline.c b/tests/test-getline.c index 6b66d71db..cdfefd909 100644 --- a/tests/test-getline.c +++ b/tests/test-getline.c @@ -47,14 +47,14 @@ main (int argc, char **argv) if (!f || fwrite ("a\nbc\nd\0f", 1, 8, f) != 8 || fclose (f) != 0) { fputs ("Failed to create sample file.\n", stderr); - unlink ("test-getline.txt"); + remove ("test-getline.txt"); return 1; } f = fopen ("test-getline.txt", "rb"); if (!f) { fputs ("Failed to reopen sample file.\n", stderr); - unlink ("test-getline.txt"); + remove ("test-getline.txt"); return 1; } @@ -84,6 +84,6 @@ main (int argc, char **argv) free (line); fclose (f); - unlink ("test-getline.txt"); + remove ("test-getline.txt"); return 0; } -- 2.11.0