Changeset 24143

Timestamp:

10/29/09 22:25:56 (4 weeks ago)

Author:

broder

Message:

In rs:

• Rename getline to rs_getline to avoid conflicting with the getline in <stdio.h>.

Location:

trunk/third/rs

Files:

• debian/changelog (modified) (1 diff)
• rs.c (modified) (4 diffs)

trunk/third/rs/debian/changelog

@@ +1 @@
+debathena-rs (10.0.3) unstable; urgency=low
+
+  * Rename getline to rs_getline to avoid conflicting with the getline in
+    <stdio.h>.
+
+ -- Evan Broder <broder@mit.edu>  Thu, 29 Oct 2009 22:23:09 -0400
+
 debathena-rs (10.0.2) unstable; urgency=low
 

trunk/third/rs/rs.c

@@ -89 +89 @@
 void      getargs(int, char *[]);
 void      getfile(void);
-int       getline(void);
+int       rs_getline(void);
 char     *getlist(short **, char *);
 char     *getnum(int *, char *, int);
@@ -129 +129 @@
 
         while (skip--) {
-                getline();
+                rs_getline();
                 if (flags & SKIPPRINT)
                         puts(curline);
         }
-        getline();
+        rs_getline();
         if (flags & NOARGS && curlen < owidth)
                 flags |= ONEPERLINE;
@@ -179 +179 @@
                         }
                 }
-        } while (getline() != EOF);
+        } while (rs_getline() != EOF);
         *ep = 0;                                /* mark end of pointers */
         nelem = ep - elem;
@@ -335 +335 @@
 
 int
-getline()       /* get line; maintain curline, curlen; manage storage */
+rs_getline()    /* get line; maintain curline, curlen; manage storage */
 {
         static  int putlength;