[pulseaudio-commits] r1656 - in /branches/lennart/src/pulsecore: asyncmsgq.c asyncmsgq.h asyncq.h authkey.c core-scache.c core-util.c memblock.c sink.c

svnmailer-noreply at 0pointer.de svnmailer-noreply at 0pointer.de
Sun Aug 12 16:24:06 PDT 2007 

Author: lennart
Date: Mon Aug 13 01:24:05 2007
New Revision: 1656

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=3D1656&root=3Dpulseaudio&vi=
ew=3Drev
Log:
64 bit fixes and minor gcc shut ups

Modified:
    branches/lennart/src/pulsecore/asyncmsgq.c
    branches/lennart/src/pulsecore/asyncmsgq.h
    branches/lennart/src/pulsecore/asyncq.h
    branches/lennart/src/pulsecore/authkey.c
    branches/lennart/src/pulsecore/core-scache.c
    branches/lennart/src/pulsecore/core-util.c
    branches/lennart/src/pulsecore/memblock.c
    branches/lennart/src/pulsecore/sink.c

Modified: branches/lennart/src/pulsecore/asyncmsgq.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/pulsecore/=
asyncmsgq.c?rev=3D1656&root=3Dpulseaudio&r1=3D1655&r2=3D1656&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/lennart/src/pulsecore/asyncmsgq.c (original)
+++ branches/lennart/src/pulsecore/asyncmsgq.c Mon Aug 13 01:24:05 2007
@@ -191,7 +191,7 @@
     if (chunk)
         *chunk =3D a->current->memchunk;
 =

-    pa_log_debug("Get q=3D%p object=3D%p (%s) code=3D%i data=3D%p chunk.le=
ngth=3D%u", (void*) a, (void*) a->current->object, a->current->object ? a->=
current->object->parent.type_name : NULL, a->current->code, (void*) a->curr=
ent->userdata, a->current->memchunk.length);
+    pa_log_debug("Get q=3D%p object=3D%p (%s) code=3D%i data=3D%p chunk.le=
ngth=3D%lu", (void*) a, (void*) a->current->object, a->current->object ? a-=
>current->object->parent.type_name : NULL, a->current->code, (void*) a->cur=
rent->userdata, (unsigned long) a->current->memchunk.length);
     =

     return 0;
 }

Modified: branches/lennart/src/pulsecore/asyncmsgq.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/pulsecore/=
asyncmsgq.h?rev=3D1656&root=3Dpulseaudio&r1=3D1655&r2=3D1656&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/lennart/src/pulsecore/asyncmsgq.h (original)
+++ branches/lennart/src/pulsecore/asyncmsgq.h Mon Aug 13 01:24:05 2007
@@ -54,7 +54,7 @@
 =

 typedef struct pa_asyncmsgq pa_asyncmsgq;
 =

-pa_asyncmsgq* pa_asyncmsgq_new(size_t size);
+pa_asyncmsgq* pa_asyncmsgq_new(unsigned size);
 pa_asyncmsgq* pa_asyncmsgq_ref(pa_asyncmsgq *q);
 void pa_asyncmsgq_unref(pa_asyncmsgq* q);
 =


Modified: branches/lennart/src/pulsecore/asyncq.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/pulsecore/=
asyncq.h?rev=3D1656&root=3Dpulseaudio&r1=3D1655&r2=3D1656&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/lennart/src/pulsecore/asyncq.h (original)
+++ branches/lennart/src/pulsecore/asyncq.h Mon Aug 13 01:24:05 2007
@@ -43,7 +43,7 @@
 =

 typedef struct pa_asyncq pa_asyncq;
 =

-pa_asyncq* pa_asyncq_new(size_t size);
+pa_asyncq* pa_asyncq_new(unsigned size);
 void pa_asyncq_free(pa_asyncq* q, pa_free_cb_t free_cb);
 =

 void* pa_asyncq_pop(pa_asyncq *q, int wait);

Modified: branches/lennart/src/pulsecore/authkey.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/pulsecore/=
authkey.c?rev=3D1656&root=3Dpulseaudio&r1=3D1655&r2=3D1656&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/lennart/src/pulsecore/authkey.c (original)
+++ branches/lennart/src/pulsecore/authkey.c Mon Aug 13 01:24:05 2007
@@ -57,7 +57,7 @@
     pa_random(ret_data, length);
 =

     lseek(fd, 0, SEEK_SET);
-    ftruncate(fd, 0);
+    (void) ftruncate(fd, 0);
 =

     if ((r =3D pa_loop_write(fd, ret_data, length, NULL)) < 0 || (size_t) =
r !=3D length) {
         pa_log("Failed to write cookie file: %s", pa_cstrerror(errno));

Modified: branches/lennart/src/pulsecore/core-scache.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/pulsecore/=
core-scache.c?rev=3D1656&root=3Dpulseaudio&r1=3D1655&r2=3D1656&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/lennart/src/pulsecore/core-scache.c (original)
+++ branches/lennart/src/pulsecore/core-scache.c Mon Aug 13 01:24:05 2007
@@ -164,8 +164,8 @@
     if (idx)
         *idx =3D e->index;
 =

-    pa_log_debug("created sample \"%s\" (#%d), %d bytes with sample spec %=
s",
-        name, e->index, e->memchunk.length,
+    pa_log_debug("created sample \"%s\" (#%d), %lu bytes with sample spec =
%s",
+                 name, e->index, (unsigned long) e->memchunk.length,
         pa_sample_spec_snprint(st, sizeof(st), &e->sample_spec));
 =

     return 0;
@@ -315,7 +315,6 @@
 =

     return pa_scache_play_item(c, name, sink, volume);
 }
-
 =

 const char * pa_scache_get_name_by_id(pa_core *c, uint32_t id) {
     pa_scache_entry *e;

Modified: branches/lennart/src/pulsecore/core-util.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/pulsecore/=
core-util.c?rev=3D1656&root=3Dpulseaudio&r1=3D1655&r2=3D1656&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/lennart/src/pulsecore/core-util.c (original)
+++ branches/lennart/src/pulsecore/core-util.c Mon Aug 13 01:24:05 2007
@@ -169,7 +169,7 @@
         uid =3D getuid();
     if (gid =3D=3D (gid_t)-1)
         gid =3D getgid();
-    chown(dir, uid, gid);
+    (void) chown(dir, uid, gid);
 #endif
 =

 #ifdef HAVE_CHMOD

Modified: branches/lennart/src/pulsecore/memblock.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/pulsecore/=
memblock.c?rev=3D1656&root=3Dpulseaudio&r1=3D1655&r2=3D1656&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/lennart/src/pulsecore/memblock.c (original)
+++ branches/lennart/src/pulsecore/memblock.c Mon Aug 13 01:24:05 2007
@@ -311,7 +311,7 @@
         pa_atomic_ptr_store(&b->data, mempool_slot_data(slot));
 =

     } else {
-        pa_log_debug("Memory block too large for pool: %u > %u", length, p=
->block_size - sizeof(struct mempool_slot));
+        pa_log_debug("Memory block too large for pool: %lu > %lu", (unsign=
ed long) length, (unsigned long) (p->block_size - sizeof(struct mempool_slo=
t)));
         pa_atomic_inc(&p->stat.n_too_large_for_pool);
         return NULL;
     }

Modified: branches/lennart/src/pulsecore/sink.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/pulsecore/=
sink.c?rev=3D1656&root=3Dpulseaudio&r1=3D1655&r2=3D1656&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/lennart/src/pulsecore/sink.c (original)
+++ branches/lennart/src/pulsecore/sink.c Mon Aug 13 01:24:05 2007
@@ -738,7 +738,7 @@
                 =

                 volume_is_norm =3D pa_cvolume_is_norm(&info->sink_input->t=
hread_info.volume);
 =

-                pa_log_debug("Buffering %u bytes ...", info->buffer_bytes);
+                pa_log_debug("Buffering l%u bytes ...", (unsigned long) in=
fo->buffer_bytes);
                 =

                 while (info->buffer_bytes > 0) {
                     pa_memchunk memchunk;
@@ -772,7 +772,7 @@
 =

                 pa_memblockq_sink_input_set_queue(info->ghost_sink_input, =
info->buffer);
 =

-                pa_log_debug("Buffered %u bytes ...", pa_memblockq_get_len=
gth(info->buffer));
+                pa_log_debug("Buffered %lu bytes ...", (unsigned long) pa_=
memblockq_get_length(info->buffer));
             }
 =

             /* Let's remove the sink input ...*/

More information about the pulseaudio-commits mailing list