[PATCH v2 08/14] Log messages in TouchBeginDDXTouch() in a signal-safe manner

[Chase Douglas]

On 04/11/2012 04:32 PM, Peter Hutterer wrote:
> On Mon, Apr 09, 2012 at 11:17:34AM -0700, Chase Douglas wrote:
>> Signed-off-by: Chase Douglas <chase.douglas at canonical.com>
>> ---
>>  dix/touch.c |    7 +++----
>>  1 files changed, 3 insertions(+), 4 deletions(-)
>>
>> diff --git a/dix/touch.c b/dix/touch.c
>> index 61e6d53..5a72a4a 100644
>> --- a/dix/touch.c
>> +++ b/dix/touch.c
>> @@ -161,7 +161,7 @@ TouchBeginDDXTouch(DeviceIntPtr dev, uint32_t ddx_id)
>>      TouchClassPtr t = dev->touch;
>>      DDXTouchPointInfoPtr ti = NULL;
>>      Bool emulate_pointer = (t->mode == XIDirectTouch);
>> -    char number[20];
>> +    char string[20];
>>  
>>      if (!t)
>>          return NULL;
>> @@ -199,12 +199,11 @@ TouchBeginDDXTouch(DeviceIntPtr dev, uint32_t ddx_id)
>>      /* If we get here, then we've run out of touches and we need to drop the
>>       * event (we're inside the SIGIO handler here) schedule a WorkProc to
>>       * grow the queue for us for next time. */
>> -    FormatUInt32(dev->last.num_touches, number);
>> -
>>      LogMessageVerbSigSafe(X_NONE, -1, dev->name);
>>      LogMessageVerbSigSafe(X_NONE, -1,
>>                            ": not enough space for touch events (max ");
>> -    LogMessageVerbSigSafe(X_NONE, -1, number);
>> +    FormatUInt64(dev->last.num_touches, string);
>> +    LogMessageVerbSigSafe(X_NONE, -1, string);
>>      LogMessageVerbSigSafe(X_NONE, -1, " touchpoints). Dropping this event.\n");
>>  
>>      if (!BitIsOn(resize_waiting, dev->id)) {
>> -- 
>> 1.7.9.1
> 
> this should be squased into 07/14, no?

I meant for a separate commit for each "fixed" log path, so it looks
like the second half of 07 should have been part of this patch. I'll fix
it up.

-- Chase