[aRts removal] Exorcizo te, omnis spiritus immunde, in nomine Dei Patris omnipotentis

[sxemacs] / src / media / sound-jack.c

diff --git a/src/media/sound-jack.c b/src/media/sound-jack.c
index 85b934b..aa76fa6 100644 (file)
--- a/src/media/sound-jack.c
+++ b/src/media/sound-jack.c
@@ -195,7 +195,8 @@ sound_jack_subthread_create(void)
        /* create out output ports */
        for (i = 0; i < sjsd->num_ports; i++) {
                char pname[30];
-               snprintf(pname, 30, "SXEmacs out_%d", i);
+               int sz = snprintf(pname, sizeof(pname), "SXEmacs out_%d", i);
+               assert(sz>=0 && sz<sizeof(pname));
                sjsd->ports[i] = jack_port_register(
                        client, pname,
                        JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0);
@@ -370,7 +371,7 @@ sound_jack_error(const char *errmsg)
 static void
 sound_jack_shutdown_cbfun(void *arg)
 {
-       JACK_CRITICAL("Shutdown: 0x%x\n", (unsigned int)arg);
+       JACK_CRITICAL("Shutdown: %p\n", arg);
 
        LONGJMP(jack_server_sig, 1);
 
@@ -500,7 +501,7 @@ sound_jack_process(jack_nframes_t nframes, void *userdata)
        if ((curvol = aj->volume) != sjsd->volume) {
                sjsd->fvol = (float)curvol / MEDIA_SAMPLE_VOLUME_NORM;
                sjsd->volume = curvol;
-        }
+       }
 
        if (aj->ratetrafo != sjsd->ratetrafo) {
                sjsd->ratetrafo = aj->ratetrafo;