Changeset 5586:5b82b3417705 in roaraudio
- Timestamp:
- 07/22/12 02:24:07 (12 years ago)
- Branch:
- default
- Phase:
- public
- Location:
- roard
- Files:
-
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
roard/auth.c
r5381 r5586 104 104 struct at_trust * t = &(key->at_data.trust); 105 105 size_t i; 106 107 (void)authmes; 106 108 107 109 // we ship pids at the moment as cs does not contain a verifyed one. -
roard/clients.c
r5580 r5586 915 915 } 916 916 917 if ( ret == len ) {917 if ( ret == (ssize_t)len ) { 918 918 if ( roar_buffer_next(&(cs->outbuf)) == -1 ) { 919 919 clients_delete(id); … … 960 960 } 961 961 962 int clients_send_mon (struct roar_audio_info * sa , uint32_t pos) {962 int clients_send_mon (struct roar_audio_info * sa) { 963 963 int i; 964 964 // int fh; … … 1009 1009 } 1010 1010 1011 int clients_send_filter(struct roar_audio_info * sa , uint32_t pos) {1011 int clients_send_filter(struct roar_audio_info * sa) { 1012 1012 struct roar_client * c; 1013 1013 int i; -
roard/driver.c
r5388 r5586 293 293 int ret; 294 294 295 ROAR_DBG("driver_cdriver_open(inst=%p, device='%s', info=%p, fh=%i) = ?", inst, device, info, fh); 295 (void)sstream; 296 297 ROAR_DBG("driver_cdriver_open(inst=%p, device='%s', info=%p, fh=%i, sstream=%p) = ?", inst, device, info, fh, sstream); 298 299 if ( fh != -1 ) { 300 roar_err_set(ROAR_ERROR_NOTSUP); 301 return -1; 302 } 296 303 297 304 if (device == NULL) { … … 320 327 321 328 int driver_dummy_ctl(struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) { 329 (void)vio; 330 322 331 switch (cmd) { 323 332 case ROAR_VIO_CTL_NONBLOCK: -
roard/driver_esd.c
r5381 r5586 29 29 int driver_esd_open_vio(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh, struct roar_stream_server * sstream) { 30 30 esd_format_t format = ESD_STREAM | ESD_PLAY; 31 char name[] = "roard"; 31 const char * name = "roard"; 32 33 (void)sstream; 32 34 33 35 if ( fh != -1 ) -
roard/include/client.h
r5576 r5586 135 135 int clients_check (int id); 136 136 int clients_flush (int id); 137 int clients_send_mon (struct roar_audio_info * sa , uint32_t pos);138 int clients_send_filter(struct roar_audio_info * sa , uint32_t pos);137 int clients_send_mon (struct roar_audio_info * sa); 138 int clients_send_filter(struct roar_audio_info * sa); 139 139 140 140 int clients_add_output (int id, struct roar_buffer ** buf); -
roard/include/sources.h
r5381 r5586 54 54 int sources_add_new (struct roar_source * source, 55 55 char * driver, char * device, 56 char * container,57 56 char * options, int primary); 58 57 -
roard/lib.c
r5568 r5586 30 30 pid_t child; 31 31 int fh[3] = {-1, -1, -1}; 32 int i;32 size_t i; 33 33 34 34 ROAR_WARN("lib_run_bg(cmd='%s', ...): This function should never be called. Contact devels."); -
roard/loop.c
r5381 r5586 127 127 } else { 128 128 #endif 129 clients_send_filter(sa , g_pos);129 clients_send_filter(sa); 130 130 // streams_send_filter_all(); // this currently results in deadlocks. 131 clients_send_mon(sa , g_pos);131 clients_send_mon(sa); 132 132 #ifdef ROAR_HAVE_USLEEP 133 133 } -
roard/meta.c
r5381 r5586 86 86 87 87 int stream_meta_get (int id, int type, const char * name, char * val, size_t len) { 88 int i, vallen; 88 size_t i; 89 size_t vallen; 89 90 struct roar_stream_server * s = g_streams[id]; 90 91 -
roard/network.c
r5585 r5586 41 41 size_t num = 0; 42 42 ssize_t ret; 43 int i;43 size_t i; 44 44 45 45 for (i = 0; i < ROAR_MAX_LISTEN_SOCKETS; i++) { -
roard/plugins.c
r5582 r5586 65 65 } 66 66 67 static void inlineplugins_delete(struct _roard_plugin * plugin) {67 static inline void plugins_delete(struct _roard_plugin * plugin) { 68 68 int i; 69 69 … … 235 235 static int plugin_callback(enum roar_dl_fnreg_action action, int fn, int subtype, const void * object, size_t objectlen, int version, int options, void * userdata, struct roar_dl_lhandle * lhandle) { 236 236 237 (void)options, (void)userdata; 238 237 239 ROAR_DBG("plugin_callback(action=%i, fn=%i, subtype=%i, object=%p, objectlen=%llu, version=%i, options=0x%x, userdata=%p, lhandle=%p) = ?", (int)action, fn, subtype, object, (long long unsigned int)objectlen, version, options, userdata, lhandle); 238 240 -
roard/req.c
r5581 r5586 74 74 75 75 int req_on_noop (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) { 76 (void)client, (void)data, (void)flags; 76 77 mes->cmd = ROAR_CMD_OK; 77 78 mes->pos = g_pos; … … 84 85 struct roar_client * c; 85 86 int max_len; 87 88 (void)data, (void)flags; 86 89 87 90 if ( mes->datalen < 1 ) … … 131 134 int ret; 132 135 136 (void)flags; 137 133 138 clients_get_server(client, &cs); 134 139 … … 194 199 195 200 int req_on_whoami (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) { 201 (void)data, (void)flags; 202 196 203 mes->cmd = ROAR_CMD_OK; 197 204 mes->pos = g_pos; -
roard/roard.c
r5577 r5586 909 909 if ( *addr == '/' ) { 910 910 if ( grp != NULL || pwd != NULL ) { 911 if ( chown(addr, pwd != NULL ? pwd->pw_uid : -1, grp != NULL ? grp->gr_gid :-1) == -1 )911 if ( chown(addr, pwd != NULL ? pwd->pw_uid : (uid_t)-1, grp != NULL ? grp->gr_gid : (gid_t)-1) == -1 ) 912 912 return -1; 913 913 } … … 1242 1242 // SLP: 1243 1243 void register_slp_callback(SLPHandle hslp, SLPError errcode, void * cookie) { 1244 (void)hslp; 1244 1245 /* return the error code in the cookie */ 1245 1246 *(SLPError*)cookie = errcode; … … 1374 1375 i = 0; 1375 1376 1376 if ( trust_uid != -1 )1377 if ( trust_uid != (uid_t)-1 ) 1377 1378 key->trust.uids[i++] = trust_uid; 1378 1379 … … 1386 1387 i = 0; 1387 1388 1388 if ( trust_gid != -1 )1389 if ( trust_gid != (gid_t)-1 ) 1389 1390 key->trust.gids[i++] = trust_gid; 1390 1391 … … 2605 2606 #if defined(ROAR_HAVE_SETGID) && defined(ROAR_HAVE_SETUID) && defined(ROAR_HAVE_IO_POSIX) 2606 2607 if ( pwd != NULL || grp != NULL ) { 2607 if ( chown(pidfile, pwd != NULL ? pwd->pw_uid : -1, grp != NULL ? grp->gr_gid :-1) == -1 ) {2608 if ( chown(pidfile, pwd != NULL ? pwd->pw_uid : (uid_t)-1, grp != NULL ? grp->gr_gid : (gid_t)-1) == -1 ) { 2608 2609 ROAR_WARN("Can not change ownership of pidfile: %s: %s", pidfile, strerror(errno)); 2609 2610 } -
roard/sources.c
r5388 r5586 111 111 if ( !strcmp(g_source[i].name, driver) ) { 112 112 if ( g_source[i].new_open != NULL ) { 113 return sources_add_new(&(g_source[i]), driver, device, container,options, primary);113 return sources_add_new(&(g_source[i]), driver, device, options, primary); 114 114 } else if ( g_source[i].old_open != NULL ) { 115 115 return g_source[i].old_open(driver, device, container, options, primary); … … 127 127 int sources_add_new (struct roar_source * source, 128 128 char * driver, char * device, 129 char * container,130 129 char * options, int primary) { 131 130 int stream; … … 255 254 struct roar_vio_defaults def; 256 255 256 (void)driver; 257 257 258 if ( roar_vio_dstr_init_defaults(&def, ROAR_VIO_DEF_TYPE_NONE, O_RDONLY, 0644) == -1 ) 258 259 return -1; … … 282 283 struct roar_vio_defaults def; 283 284 285 (void)driver, (void)container; 286 284 287 if ( roar_vio_dstr_init_defaults(&def, ROAR_VIO_DEF_TYPE_NONE, O_RDONLY, 0644) == -1 ) 285 288 return -1; … … 385 388 size_t len, i; 386 389 390 (void)vio; 391 387 392 ROAR_DBG("sources_radionoise_read(vio=%p, buf=%p, count=%llu) = 0", vio, buf, (long long unsigned int)count); 388 393 … … 418 423 419 424 static int sources_radionoise_ctl(struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) { 425 (void)vio, (void)data; 426 420 427 if ( cmd == ROAR_VIO_CTL_NONBLOCK ) 421 428 return 0; … … 428 435 struct roar_stream_server * ss; 429 436 struct roar_audio_info * info; 437 438 (void)device, (void)driver; 430 439 431 440 if ( fh > -1 ) … … 455 464 struct roar_stream * s; 456 465 466 (void)driver; 467 457 468 if ( fh > -1 ) 458 469 return -1; -
roard/ssynth.c
r5381 r5586 288 288 int id; 289 289 290 (void)vv; 291 290 292 ROAR_DBG("ssynth_note_off(note=%p, vv=%i) = ?", note, vv); 291 293
Note: See TracChangeset
for help on using the changeset viewer.