On Mon, Oct 1, 2012 at 6:55 PM, Peter Hutterer <peter.hutte...@who-t.net> wrote:
> On Fri, Sep 28, 2012 at 04:00:32PM -0700, Jason Gerecke wrote:
>> Off-list --
>>
>> In retrospect, it makes a lot more sense to just fix the xserver. I
>> can't seem to get the git master to compile over here (some weird
>> problem with lex) and was wondering if you'd mind trying to compile it
>> with the attached patch for me.
>>
>> I'll send it off to xorg-devel if all goes well and apply these
>> patches with your amendment.
>
> Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> and it's in my branch
> now. I've sent it to the list too, this is the right solution here.
> thanks!
>
> Cheers,
> Peter
>
>
Awesome :) These three have been pushed to master now. I may revert
the remaining 3 "swap empty string for NULL" patches at some point in
the future, but will leave them for now.
Jason
---
When you're rife with devastation / There's a simple explanation:
You're a toymaker's creation / Trapped inside a crystal ball.
And whichever way he tilts it / Know that we must be resilient
We won't let them break our spirits / As we sing our silly song.
>> ---
>> When you're rife with devastation / There's a simple explanation:
>> You're a toymaker's creation / Trapped inside a crystal ball.
>> And whichever way he tilts it / Know that we must be resilient
>> We won't let them break our spirits / As we sing our silly song.
>>
>>
>> On Tue, Sep 25, 2012 at 8:30 PM, Peter Hutterer
>> <peter.hutte...@who-t.net> wrote:
>> > On Tue, Sep 25, 2012 at 07:10:16PM -0700, Jason Gerecke wrote:
>> >> On Tue, Sep 25, 2012 at 6:30 PM, Peter Hutterer
>> >> <peter.hutte...@who-t.net> wrote:
>> >> > On Tue, Sep 25, 2012 at 10:28:06AM -0700, Jason Gerecke wrote:
>> >> >> Commit cff344b1 modified the null-handling of wcmCheckSource, such
>> >> >> that the wrong result will be returned if either/both fsource and
>> >> >> psource are null.
>> >> >>
>> >> >> Signed-off-by: Jason Gerecke <killert...@gmail.com>
>> >> >> ---
>> >> >> src/wcmValidateDevice.c | 8 ++++++--
>> >> >> 1 file changed, 6 insertions(+), 2 deletions(-)
>> >> >>
>> >> >> diff --git a/src/wcmValidateDevice.c b/src/wcmValidateDevice.c
>> >> >> index a296984..7551d75 100644
>> >> >> --- a/src/wcmValidateDevice.c
>> >> >> +++ b/src/wcmValidateDevice.c
>> >> >> @@ -49,13 +49,17 @@ static Bool wcmCheckSource(InputInfoPtr pInfo,
>> >> >> dev_t min_maj)
>> >> >> char* fsource =
>> >> >> xf86CheckStrOption(pInfo->options, "_source", NULL);
>> >> >> char* psource =
>> >> >> xf86CheckStrOption(pDevices->options, "_source", NULL);
>> >> >>
>> >> >> + if (!fsource)
>> >> >> + fsource = "";
>> >> >> + if (!psource)
>> >> >> + psource = "";
>> >> >> +
>> >> >
>> >> > Instead just use the 'deflt' argument to xf86CheckStrOption
>> >> > char* psource = xf86CheckStrOption(pDevices->options, "_source",
>> >> > "");
>> >> >
>> >> > With that change, Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>
>> >> >
>> >> > Cheers,
>> >> > Peter
>> >> >
>> >> >
>> >> As sensible as that is, putting a string literal there causes spurious
>> >> warnings. Addressing those warnings was the whole point of the
>> >> referenced patch(es), and I'm hesitant to re-introduce them. We'd
>> >> still be much better off than before the cleanup, but the more
>> >> warnings there are, the easier it is to overlook legitimate ones.
>> >
>> > oh right, of course. rather annoying.
>> >
>> > Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>
>> >
>> > Cheers,
>> > Peter
>> >
>> >>
>> >>
>> >> >> if (pCommon->min_maj &&
>> >> >> pCommon->min_maj == min_maj)
>> >> >> {
>> >> >> /* only add the new tool if the matching
>> >> >> major/minor
>> >> >> * was from the same source */
>> >> >> - if ((!fsource && !psource) ||
>> >> >> - (fsource && psource &&
>> >> >> strcmp(fsource, psource)))
>> >> >> + if (strcmp(fsource, psource))
>> >> >> {
>> >> >> match = 1;
>> >> >> break;
>> >> >> --
>> >> >> 1.7.12
>
>
------------------------------------------------------------------------------
Don't let slow site performance ruin your business. Deploy New Relic APM
Deploy New Relic app performance management and know exactly
what is happening inside your Ruby, Python, PHP, Java, and .NET app
Try New Relic at no cost today and get our sweet Data Nerd shirt too!
http://p.sf.net/sfu/newrelic-dev2dev
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
