awesfx/awesfx-0.5.1c-getline.patch

   1 Thomas Lercher citylife@24h.de
   2 http://bugs.gentoo.org/show_bug.cgi?id=270486
   3
   4 --- setfx.c     2007-08-29 18:00:23.000000000 +0200
   5 +++ setfx.c     2009-05-19 22:19:56.140092119 +0200
   6 @@ -37,7 +37,7 @@
   7  /*----------------------------------------------------------------*/
   8
   9  static void usage(void);
  10 -static int getline(FILE *fp);
  11 +static int awesfx_getline(FILE *fp);
  12  static int nextline(FILE *fp);
  13  static char *gettok(FILE *fp);
  14  static char *divtok(char *src, char *divs, int only_one);
  15 @@ -126,7 +126,7 @@
  16         }
  17
  18         curline = 0;
  19 -       if (!getline(fp))
  20 +       if (!awesfx_getline(fp))
  21                 return 0;
  22
  23         seq_init(seq_devname, seq_devidx);
  24 @@ -370,7 +370,7 @@
  25   * read a line and parse tokens
  26   *----------------------------------------------------------------*/
  27
  28 -static int getline(FILE *fp)
  29 +static int awesfx_getline(FILE *fp)
  30  {
  31         char *p;
  32         curline++;
  33 @@ -393,12 +393,12 @@
  34  {
  35         if (connected) {
  36                 do {
  37 -                       if (! getline(fp))
  38 +                       if (! awesfx_getline(fp))
  39                                 return FALSE;
  40                 } while (connected);
  41                 return TRUE;
  42         } else {
  43 -               return getline(fp);
  44 +               return awesfx_getline(fp);
  45         }
  46  }
  47
  48 @@ -415,7 +415,7 @@
  49         tok = divtok(NULL, " \t\r\n", FALSE);
  50         while (tok == NULL || *tok == 0) {
  51                 if (! connected) return NULL;
  52 -               if (! getline(fp)) return NULL;
  53 +               if (! awesfx_getline(fp)) return NULL;
  54                 tok = divtok(line, " \t\r\n", FALSE);
  55         }
  56         return tok;