Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-editors/elvis/files: elvis-2.2.0-glibc-2.10.patch
Date: Wed, 05 Aug 2009 18:29:31
Message-Id: E1MYlEv-0003DC-RJ@stork.gentoo.org
1 ssuominen 09/08/05 18:29:29
2
3 Added: elvis-2.2.0-glibc-2.10.patch
4 Log:
5 Fix building with GLIBC 2.10+ wrt #277559.
6 (Portage version: 2.2_rc36/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 app-editors/elvis/files/elvis-2.2.0-glibc-2.10.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/elvis/files/elvis-2.2.0-glibc-2.10.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/elvis/files/elvis-2.2.0-glibc-2.10.patch?rev=1.1&content-type=text/plain
13
14 Index: elvis-2.2.0-glibc-2.10.patch
15 ===================================================================
16 diff -ur elvis-2.2_0.orig/ref.c elvis-2.2_0/ref.c
17 --- elvis-2.2_0.orig/ref.c 2003-10-21 05:32:25.000000000 +0300
18 +++ elvis-2.2_0/ref.c 2009-08-05 21:28:30.000000000 +0300
19 @@ -42,7 +42,7 @@
20
21 #if USE_PROTOTYPES
22 static void usage(char *argv0);
23 -static char *getline(FILE *fp);
24 +static char *get_line(FILE *fp);
25 static void store(char *line, char **list);
26 static LINECLS classify(char *line, LINECLS prev);
27 static void lookup(TAG *tag);
28 @@ -171,7 +171,7 @@
29 /* This function reads a single line, and replaces the terminating newline with
30 * a '\0' byte. The string will be in a static buffer. Returns NULL at EOF.
31 */
32 -static char *getline(fp)
33 +static char *get_line(fp)
34 FILE *fp;
35 {
36 int ch;
37 @@ -348,7 +348,7 @@
38 }
39
40 /* for each line... */
41 - for (lnum = 1, lc = LC_COMPLETE; (line = getline(fp)) != NULL; lnum++)
42 + for (lnum = 1, lc = LC_COMPLETE; (line = get_line(fp)) != NULL; lnum++)
43 {
44 /* is this the tag definition? */
45 if (taglnum > 0 ? taglnum == lnum : !strncmp(tagline, line, len))
46 @@ -377,7 +377,7 @@
47 {
48 if (strchr(line, '(') != NULL)
49 {
50 - while ((line = getline(fp)) != NULL
51 + while ((line = get_line(fp)) != NULL
52 && *line
53 && ((*line != '#' && *line != '{')
54 || line[strlen(line) - 1] == '\\'))
55 @@ -387,7 +387,7 @@
56 }
57 else if ((lc = classify(line, lc)) == LC_PARTIAL)
58 {
59 - while ((line = getline(fp)) != NULL
60 + while ((line = get_line(fp)) != NULL
61 && (lc = classify(line, lc)) == LC_PARTIAL)
62 {
63 puts(line);