Re: [PATCH 1/1] unifdef.c change "getline" to "get_line" to avoid C library confusion.

[Justin Mattock]

On Thu, Mar 5, 2009 at 12:46 AM, Justin Mattock <justinmattock@xxxxxxxxx> wrote:
> On Wed, Mar 4, 2009 at 11:51 PM, Justin Mattock <justinmattock@xxxxxxxxx> wrote:
>> On Wed, Mar 4, 2009 at 10:04 PM, Frederic Weisbecker <fweisbec@xxxxxxxxx> wrote:
>>> On Wed, Mar 04, 2009 at 09:41:09PM -0800, Justin Mattock wrote:
>>>> From: Justin P. Mattock <justinmattock@xxxxxxxxx>
>>>>
>>>> This fixes an error when compiling the kernel.
>>>>
>>>>   CHK     include/linux/version.h
>>>>   HOSTCC  scripts/unifdef
>>>> scripts/unifdef.c:209: error: conflicting types for 'getline'
>>>> /usr/include/stdio.h:651: note: previous declaration of 'getline' was here
>>>> make[1]: *** [scripts/unifdef] Error 1
>>>> make: *** [__headers] Error 2
>>>>
>>>> --
>>>> scripts/unifdef.c  |  3 +++
>>>> 1 files changed, 3 insertions(+),0 deletions(-)
>>>>
>>>> diff --git a/scripts/unifdef.c b/scripts/unifdef.c
>>>> ---a/scripts/unifdef.c
>>>> +++b/scripts/unifdef.c
>>>> @@ -203,1 +203,0 @@ static void             addsym(bool, bool, char *);
>>>>
>>>>
>>>> static void             done(void);
>>>> static void             error(const char *);
>>>> static int              findsym(const char *);
>>>> static void             flushline(bool);
>>>> -static Linetype         getline(void);
>>>> +static Linetype         get_line(void);
>>>> static Linetype         ifeval(const char **);
>>>> static void             ignoreoff(void);
>>>> static void             ignoreon(void);
>>>> static void             keywordedit(const char *);
>>>>
>>>>
>>>>
>>>>
>>>> @@ -509,1 +509,0 @@ process(void)
>>>>
>>>>
>>>> {
>>>>       Linetype lineval;
>>>>
>>>>       for (;;) {
>>>>               linenum++;
>>>> -               lineval = getline();
>>>> +             lineval = get_line();
>>>>               trans_table[ifstate[depth]][lineval]();
>>>>               debug("process %s -> %s depth %d",
>>>>                   linetype_name[lineval],
>>>>                   ifstate_name[ifstate[depth]], depth);
>>>>       }
>>>> }
>>>>
>>>>
>>>> @@ -528,1 +528,0 @@ static Linetype
>>>> -getline(void)
>>>> +get_line(void)
>>>> {
>>>>       const char *cp;
>>>>
>>>> --
>>>>
>>>>
>>>> keep in mind I've never created a patch before,
>>>> (so go easy on me);
>>>
>>>
>>> Hi,
>>>
>>> You forgot to put your Signed-off-by: Justin P. Mattock <justinmattock@xxxxxxxxx>
>>> :)
>>>
>>> See Documentation/SubmittingPatches
>>>
>>> I don't know who is the maintainer of this file.
>>> Adding Andrew in Cc.
>>>
>>>
>>>> regards;
>>>>
>>>> --
>>>> Justin P. Mattock
>>>> --
>>>> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
>>>> the body of a message to majordomo@xxxxxxxxxxxxxxx
>>>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>>>> Please read the FAQ at  http://www.tux.org/lkml/
>>>
>>>
>>
>> Cool,
>> thanks for the help.
>> I'll look at the doc's and google
>> as much as possible, so I get this
>> correct.
>>
>> regards;
>>
>> --
>> Justin P. Mattock
>>
>
> O.K. after doing some reading,
> I have a better idea of how to make a
> patch. I used diff, used patch -Np1, and compiled.
> and added the signed off part.
> I'll post after this post.
> and take any suggestions on what to do next.
>
> --
> Justin P. Mattock
>


From: Justin P. Mattock <justinmattock@xxxxxxxxx>
Signed-off-by: Justin P. Mattock <justinmattock@xxxxxxxxx>

This fixes an error when compiling the kernel.

 CHK     include/linux/version.h
 HOSTCC  scripts/unifdef
scripts/unifdef.c:209: error: conflicting types for 'getline'
/usr/include/stdio.h:651: note: previous declaration of 'getline' was here
make[1]: *** [scripts/unifdef] Error 1
make: *** [__headers] Error 2

--
scripts/unifdef.c  |  3 +++
1 files changed, 3 insertions(+),0 deletions(-)

---a/scripts/unifdef.c	        2009-03-05 00:07:28.000000000 -0800
+++b/scripts/unifdef.c	2009-03-05 00:04:56.000000000 -0800
@@ -206,7 +206,7 @@ static void             done(void);
 static void             error(const char *);
 static int              findsym(const char *);
 static void             flushline(bool);
-static Linetype         getline(void);
+static Linetype         get_line(void);
 static Linetype         ifeval(const char **);
 static void             ignoreoff(void);
 static void             ignoreon(void);
@@ -512,7 +512,7 @@ process(void)

 	for (;;) {
 		linenum++;
-		lineval = getline();
+		lineval = get_line();
 		trans_table[ifstate[depth]][lineval]();
 		debug("process %s -> %s depth %d",
 		    linetype_name[lineval],
@@ -526,7 +526,7 @@ process(void)
  * help from skipcomment().
  */
 static Linetype
-getline(void)
+get_line(void)
 {
 	const char *cp;
 	int cursym;


-- 
Justin P. Mattock
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/