avoid painful getline collision, from Francois Charette, tlbuild mail

git-svn-id: svn://tug.org/texlive/trunk@13718 c570f23f-e606-0410-a88d-b1316a301751

12 files changed, 48 insertions, 28 deletions

diff --git a/Build/source/texk/afm2pl/ChangeLog b/Build/source/texk/afm2pl/ChangeLog
index 107b3246fa8..6ebadcf7664 100644
--- a/Build/source/texk/afm2pl/ChangeLog
+++ b/Build/source/texk/afm2pl/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-12  Francois Charette  <firmicus@ankabut.net>
+
+	* afm2pl.c: rename getline to texlive_getline.
+
 2009-05-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Adapt to TL2009 build system.
diff --git a/Build/source/texk/afm2pl/afm2pl.c b/Build/source/texk/afm2pl/afm2pl.c
index 0b7723f75f0..313f8b70147 100644
--- a/Build/source/texk/afm2pl/afm2pl.c
+++ b/Build/source/texk/afm2pl/afm2pl.c
@@ -345,7 +345,7 @@ P2C (register int, x, register int, y)
 
 /* read a line from infile into buffer and obuffer */
 int
-  get_line
+  texlive_getline
 P1H (void)
 {
   register char *p;
@@ -781,7 +781,7 @@ P1H (void)
     afmencoding->vec[i] = ".notdef";
   afmencoding->name = "Unspecified";
 
-  while (get_line ()) {
+  while (texlive_getline ()) {
     switch (interest (paramstring ())) {
     case FontName:
       fontname = paramnewstring ();
@@ -963,7 +963,7 @@ gettoken ()
 
   while (1) {
     while (param == 0 || *param == 0) {
-      if (get_line () == 0)
+      if (texlive_getline () == 0)
         error ("! premature end in encoding file");
     }
     if (param[0] == '%') {
@@ -1540,7 +1540,7 @@ extraligkerninfo ()
     encfilename =
       openin (encfilename, kpse_enc_format, ".enc");
     for (lig_it = 0; lig_it < 2; lig_it++) {
-      while (get_line ()) {
+      while (texlive_getline ()) {
         /* search for (ligkern) comment in line */
         for (p = buffer; *p; p++)
           if (*p == '%') {
@@ -1576,7 +1576,7 @@ extraligkerninfo ()
     for (i = 0; i < ligfilenames->n; i++) {
       ligfilename = openin (ligfilenames->names[i],
                             kpse_lig_format, ".lig");
-      while (get_line ())
+      while (texlive_getline ())
         checkligkern (buffer, 0);       /* 2nd param 0: lig file */
       fclose (infile);
     }
@@ -1607,7 +1607,7 @@ extraligkerninfo ()
   for (i = 0; i < Ligfilenames->n; i++) {
     ligfilename = openin (Ligfilenames->names[i],
                           kpse_lig_format, ".lig");
-    while (get_line ())
+    while (texlive_getline ())
       checkligkern (buffer, 0);       /* 2nd param 0: lig file */
     fclose (infile);
   }
diff --git a/Build/source/texk/dvi2tty/ChangeLog b/Build/source/texk/dvi2tty/ChangeLog
index 44ea7d806f8..3085cbdf413 100644
--- a/Build/source/texk/dvi2tty/ChangeLog
+++ b/Build/source/texk/dvi2tty/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-12  Francois Charette  <firmicus@ankabut.net>
+
+	* dvistuff.c: rename getline to texlive_getline.
+
 2009-05-27  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Adapt to TL2009 build system.
diff --git a/Build/source/texk/dvi2tty/dvistuff.c b/Build/source/texk/dvi2tty/dvistuff.c
index 7ee7c37ac8c..764bf522978 100644
--- a/Build/source/texk/dvi2tty/dvistuff.c
+++ b/Build/source/texk/dvi2tty/dvistuff.c
@@ -123,7 +123,7 @@ void            rule            P3H(bool, long, long);
 void            ruleaux         P3H(long, long, char);
 long            horizontalmove  P1H(long);
 int             skipnops        P1H(void);
-linetype    *   getline         P1H(void);
+linetype    *   texlive_getline         P1H(void);
 linetype    *   findline        P1H(void);
 unsigned long   num             P1H(int);
 long            snum            P1H(int);
@@ -149,7 +149,7 @@ void            rule            (bool, long, long);
 void            ruleaux         (long, long, char);
 long            horizontalmove  (long);
 int             skipnops        (void);
-linetype    *   getline         (void);
+linetype    *   texlive_getline         (void);
 linetype    *   findline        (void);
 unsigned long   num             (int);
 long            snum            (int);
@@ -174,7 +174,7 @@ void            rule            ();
 void            ruleaux         ();
 long            horizontalmove  ();
 int             skipnops        ();
-linetype    *   getline         ();
+linetype    *   texlive_getline         ();
 linetype    *   findline        ();
 unsigned long   num             ();
 long            snum            ();
@@ -316,7 +316,7 @@ void initpage()
     h = 0L;  v = 0L;                        /* initialize coordinates   */
     x = 0L;  w = 0L;  y = 0L;  z = 0L;      /* initialize amounts       */
     sptr = 0;                               /* initialize stack         */
-    currentline = getline();                /* initialize list of lines */
+    currentline = texlive_getline();                /* initialize list of lines */
     currentline->vv = 0L;
     firstline   = currentline;
     lastline    = currentline;
@@ -671,7 +671,7 @@ int skipnops()                      /* skips by no-op commands  */
 
 /*----------------------------------------------------------------------------*/
 
-linetype *getline()             /* returns an initialized line-object */
+linetype *texlive_getline()             /* returns an initialized line-object */
 {
     register int  i;
     register linetype *temp;
@@ -686,7 +686,7 @@ linetype *getline()             /* returns an initialized line-object */
     temp->text[i] = '\0';
     return temp;
 
-} /* getline */
+} /* texlive_getline */
 
 /*----------------------------------------------------------------------------*/
 
@@ -697,7 +697,7 @@ linetype *findline()            /* find best fit line were text should go */
 
     if (v <= firstline->vv) {                      /* above first line */
         if (firstline->vv - v > VERTICALEPSILON) {
-            temp = getline();
+            temp = texlive_getline();
             temp->next = firstline;
             firstline->prev = temp;
             temp->vv = v;
@@ -708,7 +708,7 @@ linetype *findline()            /* find best fit line were text should go */
 
     if (v >= lastline->vv) {                       /* below last line */
         if (v - lastline->vv > VERTICALEPSILON) {
-            temp = getline();
+            temp = texlive_getline();
             temp->prev = lastline;
             lastline->next = temp;
             temp->vv = v;
@@ -732,7 +732,7 @@ linetype *findline()            /* find best fit line were text should go */
     }
 
     /* no line fits suitable, generate a new one */
-    currentline = getline();
+    currentline = texlive_getline();
     currentline->next = temp->next;
     currentline->prev = temp;
     temp->next->prev = currentline;
diff --git a/Build/source/texk/dvipsk/ChangeLog b/Build/source/texk/dvipsk/ChangeLog
index 513eae694e3..0def02397a9 100644
--- a/Build/source/texk/dvipsk/ChangeLog
+++ b/Build/source/texk/dvipsk/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-12  Francois Charette  <firmicus@ankabut.net>
+
+	* afm2tfm.c: rename getline to texlive_getline.
+
 2009-06-01  Karl Berry  <karl@tug.org>
 
 	* Update version numbers to 5.98.
diff --git a/Build/source/texk/dvipsk/afm2tfm.c b/Build/source/texk/dvipsk/afm2tfm.c
index d1f20c5b7a7..6fbb069f4b0 100644
--- a/Build/source/texk/dvipsk/afm2tfm.c
+++ b/Build/source/texk/dvipsk/afm2tfm.c
@@ -260,7 +260,7 @@ transform P2C(register int, x, register int, y)
 }
 
 int
-getline P1H(void) {
+texlive_getline P1H(void) {
    register char *p ;
    register int c ;
 
@@ -615,7 +615,7 @@ readadobe P1H(void) {
    ai = newchar() ;
    ai->adobenum = -1 ;
    ai->adobename = "||" ; /* boundary character name */
-   while (getline()) {
+   while (texlive_getline()) {
       switch(interest(paramstring())) {
 case FontName:
          fontname = paramnewstring() ;
@@ -1891,7 +1891,7 @@ char *gettoken() {
 
    while (1) {
       while (param == 0 || *param == 0) {
-         if (getline() == 0)
+         if (texlive_getline() == 0)
             error("! premature end in encoding file") ;
          for (p=buffer; *p; p++)
             if (*p == '%') {
@@ -1982,7 +1982,7 @@ struct encoding *readencoding P1C(char *, enc)
       p = gettoken() ;
       if (strcmp(p, "]"))
          error("! token 258 in encoding must be make-array (])") ;
-      while (getline()) {
+      while (texlive_getline()) {
          for (p=buffer; *p; p++)
             if (*p == '%') {
                if (ignoreligkern == 0)
diff --git a/Build/source/texk/ttf2pk/ChangeLog b/Build/source/texk/ttf2pk/ChangeLog
index b8805da4cad..bec59435f63 100644
--- a/Build/source/texk/ttf2pk/ChangeLog
+++ b/Build/source/texk/ttf2pk/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-12  Francois Charette  <firmicus@ankabut.net>
+
+	* newobj.c, newobj.h, parse.c: rename getline to texlive_getline.
+
 2009-05-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Adapt to TL2009 build system.
diff --git a/Build/source/texk/ttf2pk/newobj.c b/Build/source/texk/ttf2pk/newobj.c
index 65ae9f69f0b..1a87f919283 100644
--- a/Build/source/texk/ttf2pk/newobj.c
+++ b/Build/source/texk/ttf2pk/newobj.c
@@ -128,13 +128,13 @@ get_line(FILE *f)
 
 
 /*
- *   getline() is a wrapper function for get_line().  It returns `False' in
+ *   texlive_getline() is a wrapper function for get_line().  It returns `False' in
  *   case of error and expects a pointer to a buffer to store the current
  *   line.   Additionally, the final newline character is stripped.
  */
 
 Boolean
-getline(char **bufferp, FILE *f)
+texlive_getline(char **bufferp, FILE *f)
 {
   size_t l;
 
diff --git a/Build/source/texk/ttf2pk/newobj.h b/Build/source/texk/ttf2pk/newobj.h
index 233c4ea4b16..f7c474dfa58 100644
--- a/Build/source/texk/ttf2pk/newobj.h
+++ b/Build/source/texk/ttf2pk/newobj.h
@@ -26,7 +26,7 @@ void *mycalloc(size_t len);
 void *myrealloc(void *oldp, size_t len);
 
 char *get_line(FILE *f);
-Boolean getline(char **bufferp, FILE *f);
+Boolean texlive_getline(char **bufferp, FILE *f);
 char *newstring(char *s);
 
 ttfinfo *newchar(Font *fnt);
diff --git a/Build/source/texk/ttf2pk/parse.c b/Build/source/texk/ttf2pk/parse.c
index 18a64cada78..3c5b2885ecc 100644
--- a/Build/source/texk/ttf2pk/parse.c
+++ b/Build/source/texk/ttf2pk/parse.c
@@ -63,7 +63,7 @@ gettoken(char **bufferp, size_t *offsetp, FILE *f, Font *fnt,
       if (*bufferp)
         free(*bufferp);
 
-      if (getline(bufferp, f) == False)
+      if (texlive_getline(bufferp, f) == False)
         oops("Premature end in encoding file.");
 
       curp = *bufferp;
@@ -187,7 +187,7 @@ readencoding(char **enc, Font *fnt, Boolean ignoreligkern)
         "Token 258 in encoding must be make-array (]).");
     free(p);
 
-    while (getline(&buffer, enc_file))
+    while (texlive_getline(&buffer, enc_file))
     {
       for (p = buffer; *p; p++)
         if (*p == '%')
@@ -246,7 +246,7 @@ get_replacements(Font *fnt)
   if (replacement_file == NULL)
     oops("Cannot open replacement file `%s'.", real_replacement_name);
 
-  while (getline(&buffer, replacement_file))
+  while (texlive_getline(&buffer, replacement_file))
   {
     for (p = buffer; *p; p++)
       if (*p == '%')
diff --git a/Build/source/utils/t1utils/ChangeLog b/Build/source/utils/t1utils/ChangeLog
index 9cc14b044f6..af2984d1f02 100644
--- a/Build/source/utils/t1utils/ChangeLog
+++ b/Build/source/utils/t1utils/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-12  Francois Charette  <firmicus@ankabut.net>
+
+	* t1asm.c: rename getline to texlive_getline.
+
 2009-05-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Adapt to TL2009 build system.
diff --git a/Build/source/utils/t1utils/t1asm.c b/Build/source/utils/t1utils/t1asm.c
index e3758591f69..17d991277fa 100644
--- a/Build/source/utils/t1utils/t1asm.c
+++ b/Build/source/utils/t1utils/t1asm.c
@@ -280,7 +280,7 @@ static int check_line_charstring()
    the newline is put into line[]. When terminated by '{', the '{' is not put
    into line[], and the flag start_charstring is set to 1. */
 
-static void getline()
+static void texlive_getline()
 {
   int c;
   char *p = line;
@@ -721,7 +721,7 @@ particular purpose.\n");
      without /Subrs sections and provided a patch. */
   
   while (!feof(ifp) && !ferror(ifp)) {
-    getline();
+    texlive_getline();
     
     if (!ever_active) {
       if (strncmp(line, "currentfile eexec", 17) == 0 && isspace(line[17])) {
@@ -792,7 +792,7 @@ particular purpose.\n");
   
   /* There may be additional code. */
   while (!feof(ifp) && !ferror(ifp)) {
-    getline();
+    texlive_getline();
     eexec_string(line);
   }