Patchwork [1.1] es1370: Fix debug code

login
register
mail settings
Submitter Stefan Weil
Date May 23, 2012, 9:26 p.m.
Message ID <1337808401-24717-1-git-send-email-sw@weilnetz.de>
Download mbox | patch
Permalink /patch/161036/
State Accepted
Headers show

Comments

Stefan Weil - May 23, 2012, 9:26 p.m.
When DEBUG_ES1370 is defined, the compiler shows these warnings:

hw/es1370.c: In function ‘es1370_update_voices’:
hw/es1370.c:414: warning: format ‘%d’ expects type ‘int’, but argument 3 has type ‘size_t’
hw/es1370.c: In function ‘es1370_writel’:
hw/es1370.c:582: warning: format ‘%d’ expects type ‘int’, but argument 3 has type ‘long int’
hw/es1370.c:592: warning: format ‘%d’ expects type ‘int’, but argument 3 has type ‘long int’
hw/es1370.c:609: warning: format ‘%d’ expects type ‘int’, but argument 3 has type ‘long int’
hw/es1370.c: In function ‘es1370_readl’:
hw/es1370.c:751: warning: suggest braces around empty body in an ‘if’ statement

Fix the format strings and add the missing braces.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 hw/es1370.c |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
malc - May 23, 2012, 10:03 p.m.
On Wed, 23 May 2012, Stefan Weil wrote:

> When DEBUG_ES1370 is defined, the compiler shows these warnings:
> 

[..snip..]

Thanks, applied.
Peter Maydell - May 28, 2012, 4:11 a.m.
On 23 May 2012 22:26, Stefan Weil <sw@weilnetz.de> wrote:
> When DEBUG_ES1370 is defined, the compiler shows these warnings:
>
> hw/es1370.c: In function ‘es1370_update_voices’:
> hw/es1370.c:414: warning: format ‘%d’ expects type ‘int’, but argument 3 has type ‘size_t’

The unicode quotes in this commit message seem to have got smashed to
question-mark characters at some point between this email and it hitting
git master :-(

-- PMM
Stefan Weil - May 28, 2012, 6:41 a.m.
Am 28.05.2012 06:11, schrieb Peter Maydell:
> On 23 May 2012 22:26, Stefan Weil<sw@weilnetz.de>  wrote:
>> When DEBUG_ES1370 is defined, the compiler shows these warnings:
>>
>> hw/es1370.c: In function ‘es1370_update_voices’:
>> hw/es1370.c:414: warning: format ‘%d’ expects type ‘int’, but argument 3 has type ‘size_t’
> The unicode quotes in this commit message seem to have got smashed to
> question-mark characters at some point between this email and it hitting
> git master :-(
>
> -- PMM

Malc, could you please check your git workflow?

Commit 24f50d7ea5896a30b0e78f68884586bb8b40ff97 and
other commits also changed Andreas Färber to Andreas F?rber.

See also a394aed235d6b3f048eeae83289f4d21eca7023c
and lots more.

The author is always correct, but UTF-8 characters in  the
commit message were replaced by ?.

Regards,
Stefan W.
malc - May 28, 2012, 3:18 p.m.
On Mon, 28 May 2012, Stefan Weil wrote:

> Am 28.05.2012 06:11, schrieb Peter Maydell:
> > On 23 May 2012 22:26, Stefan Weil<sw@weilnetz.de>  wrote:
> > > When DEBUG_ES1370 is defined, the compiler shows these warnings:
> > > 
> > > hw/es1370.c: In function ?es1370_update_voices?:
> > > hw/es1370.c:414: warning: format ?%d? expects type ?int?, but argument 3
> > > has type ?size_t?
> > The unicode quotes in this commit message seem to have got smashed to
> > question-mark characters at some point between this email and it hitting
> > git master :-(
> > 
> > -- PMM
> 
> Malc, could you please check your git workflow?

Pine's '|' does that with my LC_CTYPE it seems, have to either ctrl-w 
after '|' or export, either way - can do.

> 
> Commit 24f50d7ea5896a30b0e78f68884586bb8b40ff97 and
> other commits also changed Andreas F?rber to Andreas F?rber.
> 
> See also a394aed235d6b3f048eeae83289f4d21eca7023c
> and lots more.
> 
> The author is always correct, but UTF-8 characters in  the
> commit message were replaced by ?.
> 
> Regards,
> Stefan W.
>
Andreas Färber - May 28, 2012, 3:32 p.m.
Am 28.05.2012 17:18, schrieb malc:
> On Mon, 28 May 2012, Stefan Weil wrote:
> 
>> Am 28.05.2012 06:11, schrieb Peter Maydell:
>>> On 23 May 2012 22:26, Stefan Weil<sw@weilnetz.de>  wrote:
>>>> When DEBUG_ES1370 is defined, the compiler shows these warnings:
>>>>
>>>> hw/es1370.c: In function ?es1370_update_voices?:
>>>> hw/es1370.c:414: warning: format ?%d? expects type ?int?, but argument 3
>>>> has type ?size_t?
>>> The unicode quotes in this commit message seem to have got smashed to
>>> question-mark characters at some point between this email and it hitting
>>> git master :-(
>>>
>>> -- PMM
>>
>> Malc, could you please check your git workflow?
> 
> Pine's '|' does that with my LC_CTYPE it seems, have to either ctrl-w 
> after '|' or export, either way - can do.

Recently I suspected your mailer and on one of the TCG threads suggested
to download from Patchwork instead.

But Patchwork also has its flaws: It tries to add *-bys from the
replies, in the order it receives them rather than where they were
placed and, like Anthony's mailbox script, it might pick up false
positives. And when there's line-wrapping in the original mail it might
silently drop part of the patch or in the combination of line-wrapping
and patch attachment drop and duplicate parts.

So if you can fix by some clever scripting that'll be safest. :)

Thanks,
Andreas

Patch

diff --git a/hw/es1370.c b/hw/es1370.c
index f19cef3..573f747 100644
--- a/hw/es1370.c
+++ b/hw/es1370.c
@@ -410,7 +410,7 @@  static void es1370_update_voices (ES1370State *s, uint32_t ctl, uint32_t sctl)
 
         if ((old_fmt != new_fmt) || (old_freq != new_freq)) {
             d->shift = (new_fmt & 1) + (new_fmt >> 1);
-            ldebug ("channel %d, freq = %d, nchannels %d, fmt %d, shift %d\n",
+            ldebug ("channel %zu, freq = %d, nchannels %d, fmt %d, shift %d\n",
                     i,
                     new_freq,
                     1 << (new_fmt & 1),
@@ -578,7 +578,7 @@  IO_WRITE_PROTO (es1370_writel)
         d++;
     case ES1370_REG_DAC1_SCOUNT:
         d->scount = (val & 0xffff) | (d->scount & ~0xffff);
-        ldebug ("chan %d CURR_SAMP_CT %d, SAMP_CT %d\n",
+        ldebug ("chan %td CURR_SAMP_CT %d, SAMP_CT %d\n",
                 d - &s->chan[0], val >> 16, (val & 0xffff));
         break;
 
@@ -588,7 +588,7 @@  IO_WRITE_PROTO (es1370_writel)
         d++;
     case ES1370_REG_DAC1_FRAMEADR:
         d->frame_addr = val;
-        ldebug ("chan %d frame address %#x\n", d - &s->chan[0], val);
+        ldebug ("chan %td frame address %#x\n", d - &s->chan[0], val);
         break;
 
     case ES1370_REG_PHANTOM_FRAMECNT:
@@ -605,7 +605,7 @@  IO_WRITE_PROTO (es1370_writel)
     case ES1370_REG_DAC1_FRAMECNT:
         d->frame_cnt = val;
         d->leftover = 0;
-        ldebug ("chan %d frame count %d, buffer size %d\n",
+        ldebug ("chan %td frame count %d, buffer size %d\n",
                 d - &s->chan[0], val >> 16, val & 0xffff);
         break;
 
@@ -745,9 +745,10 @@  IO_READ_PROTO (es1370_readl)
         {
             uint32_t size = ((d->frame_cnt & 0xffff) + 1) << 2;
             uint32_t curr = ((d->frame_cnt >> 16) + 1) << 2;
-            if (curr > size)
+            if (curr > size) {
                 dolog ("read framecnt curr %d, size %d %d\n", curr, size,
                        curr > size);
+            }
         }
 #endif
         break;