[pkgsrc/trunk]: pkgsrc/archivers/pax/files getline -> get_line

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2c8ef7526deb
branches:  trunk
changeset: 396965:2c8ef7526deb
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Aug 06 13:54:03 2009 +0000

description:
getline -> get_line

diffstat:

 archivers/pax/files/options.c |  20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diffs (83 lines):

diff -r 13cd1f1d2c34 -r 2c8ef7526deb archivers/pax/files/options.c
--- a/archivers/pax/files/options.c     Thu Aug 06 13:12:50 2009 +0000
+++ b/archivers/pax/files/options.c     Thu Aug 06 13:54:03 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: options.c,v 1.9 2007/03/08 17:18:18 rillig Exp $       */
+/*     $NetBSD: options.c,v 1.10 2009/08/06 13:54:03 joerg Exp $       */
 
 /*-
  * Copyright (c) 1992 Keith Muller.
@@ -48,7 +48,7 @@
 #if 0
 static char sccsid[] = "@(#)options.c  8.2 (Berkeley) 4/18/94";
 #else
-__RCSID("$NetBSD: options.c,v 1.9 2007/03/08 17:18:18 rillig Exp $");
+__RCSID("$NetBSD: options.c,v 1.10 2009/08/06 13:54:03 joerg Exp $");
 #endif
 #endif /* not lint */
 
@@ -120,7 +120,7 @@
 static void printflg(unsigned int);
 static int c_frmt(const void *, const void *);
 static off_t str_offt(char *);
-static char *getline(FILE *fp);
+static char *get_line(FILE *fp);
 static void pax_options(int, char **);
 static void pax_usage(void);
 static void tar_options(int, char **);
@@ -130,7 +130,7 @@
 static void cpio_usage(void);
 #endif
 
-/* errors from getline */
+/* errors from get_line */
 #define GETLINE_FILE_CORRUPT 1
 #define GETLINE_OUT_OF_MEM 2
 static int getline_error;
@@ -1217,7 +1217,7 @@
                                                tty_warn(1, "Unable to open file '%s' for read", file);
                                                tar_usage();
                                        }
-                                       while ((str = getline(fp)) != NULL) {
+                                       while ((str = get_line(fp)) != NULL) {
                                                if (dirisnext) {
                                                        dir = str;
                                                        dirisnext = 0;
@@ -1309,7 +1309,7 @@
                                        tty_warn(1, "Unable to open file '%s' for read", file);
                                        tar_usage();
                                }
-                               while ((str = getline(fp)) != NULL) {
+                               while ((str = get_line(fp)) != NULL) {
                                        if (dirisnext) {
                                                if (ftree_add(str, 1) < 0)
                                                        tar_usage();
@@ -1621,7 +1621,7 @@
                                    optarg);
                                cpio_usage();
                        }
-                       while ((str = getline(fp)) != NULL) {
+                       while ((str = get_line(fp)) != NULL) {
                                pat_add(str, NULL);
                        }
                        fclose(fp);
@@ -1777,7 +1777,7 @@
                 * no read errors allowed on updates/append operation!
                 */
                maxflt = 0;
-               while ((str = getline(stdin)) != NULL) {
+               while ((str = get_line(stdin)) != NULL) {
                        ftree_add(str, 0);
                }
                if (getline_error) {
@@ -2007,8 +2007,8 @@
        return(num);
 }
 
-char *
-getline(FILE *f)
+static char *
+get_line(FILE *f)
 {
        char *name, *temp;
        size_t len;