From: Michael Shigorin <mike@osdn.org.ua>
To: devel@lists.altlinux.org
Cc: solo@altlinux.org
Subject: Re: [devel] apache-1.3.41rusPL30.23-alt6: Sisyphus/i586 test rebuild failed
Date: Wed, 13 May 2009 20:50:12 +0300
Message-ID: <20090513175012.GV15370@osdn.org.ua> (raw)
In-Reply-To: <20090507204438.C4C9A151C4AB@granary.armor.altlinux.org>
[-- Attachment #1: Type: text/plain, Size: 459 bytes --]
On Fri, May 08, 2009 at 12:44:38AM +0400, QA Team Robot wrote:
> Package: apache-1.3.41rusPL30.23-alt6
> htpasswd.c:101: error: conflicting types for 'getline'
> /usr/include/stdio.h:653: note: previous declaration of 'getline' was here
Лёш, достаточно переименовать этот скорее всего внутренний
getline() во что-то ещё, как сделали в ядре и ряде других мест.
--
---- WBR, Michael Shigorin <mike@altlinux.ru>
------ Linux.Kiev http://www.linux.kiev.ua/
[-- Attachment #2: strongswan-4.2.14-alt-glibc29.patch --]
[-- Type: text/plain, Size: 1543 bytes --]
diff -Naur strongswan-4.2.14-orig/src/libfreeswan/optionsfrom.c strongswan-4.2.14/src/libfreeswan/optionsfrom.c
--- strongswan-4.2.14-orig/src/libfreeswan/optionsfrom.c 2008-12-23 06:24:06 +0000
+++ strongswan-4.2.14/src/libfreeswan/optionsfrom.c 2009-05-13 14:29:08 +0000
@@ -31,7 +31,7 @@
static const char *dowork(const char *, int *, char ***, int);
static const char *getanarg(FILE *, struct work *, char **);
-static char *getline(FILE *, char *, size_t);
+static char *parseline(FILE *, char *, size_t);
/*
- optionsfrom - add some options, taken from a file, to argc/argv
@@ -149,7 +149,7 @@
char *endp;
while (w->pending == NULL) { /* no pending line */
- if ((w->line = getline(f, w->buf, sizeof(w->buf))) == NULL)
+ if ((w->line = parseline(f, w->buf, sizeof(w->buf))) == NULL)
return "error in line read"; /* caller checks EOF */
if (w->line[0] != '#' &&
*(w->line + strspn(w->line, " \t")) != '\0')
@@ -171,7 +171,7 @@
if (*linep == NULL)
return "out of memory for new line";
strcpy(*linep, p);
- } else /* getline already malloced it */
+ } else /* parseline already malloced it */
*linep = p;
return NULL;
}
@@ -203,10 +203,10 @@
}
/*
- - getline - read a line from the file, trim newline off
+ - parseline - read a line from the file, trim newline off
*/
static char * /* pointer to line, NULL for eof/error */
-getline(f, buf, bufsize)
+parseline(f, buf, bufsize)
FILE *f;
char *buf; /* buffer to use, if convenient */
size_t bufsize; /* size of buf */
next parent reply other threads:[~2009-05-13 17:50 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-13 17:50 ` Michael Shigorin [this message]
2009-05-14 9:46 ` REAL
2009-05-14 10:21 ` Andrey Rahmatullin
2009-05-14 10:32 ` Led
2009-05-15 1:41 ` REAL
2009-05-15 8:21 ` Michael Shigorin
2009-05-15 11:14 ` Led
2009-05-15 11:35 ` Damir Shayhutdinov
2009-05-18 2:36 ` REAL
2009-05-21 17:02 ` Michael Shigorin
2009-05-21 17:24 ` Aleksey Avdeev
2009-05-14 10:36 ` Aleksey Avdeev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090513175012.GV15370@osdn.org.ua \
--to=mike@osdn.org.ua \
--cc=devel@lists.altlinux.org \
--cc=solo@altlinux.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
ALT Linux Team development discussions
This inbox may be cloned and mirrored by anyone:
git clone --mirror http://lore.altlinux.org/devel/0 devel/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 devel devel/ http://lore.altlinux.org/devel \
devel@altlinux.org devel@altlinux.ru devel@lists.altlinux.org devel@lists.altlinux.ru devel@linux.iplabs.ru mandrake-russian@linuxteam.iplabs.ru sisyphus@linuxteam.iplabs.ru
public-inbox-index devel
Example config snippet for mirrors.
Newsgroup available over NNTP:
nntp://lore.altlinux.org/org.altlinux.lists.devel
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git