Changeset 5754:b23d79c13370 in roaraudio for roard
- Timestamp:
- 11/16/12 16:49:56 (11 years ago)
- Branch:
- default
- Phase:
- public
- Location:
- roard
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
roard/driver_dmx.c
r5708 r5754 32 32 struct roar_vio_calls * vio; 33 33 int err; 34 const char * dev = device; 34 35 35 36 if ( roar_vio_dstr_init_defaults(&def, ROAR_VIO_DEF_TYPE_NONE, O_WRONLY, 0644) == -1 ) … … 42 43 43 44 if ( fh == -1 ) { 44 if ( dev ice== NULL )45 dev ice = getenv("DMX");45 if ( dev == NULL ) 46 dev = roar_env_get("DMX"); 46 47 47 if ( dev ice== NULL )48 dev ice= "/dev/dmx";48 if ( dev == NULL ) 49 dev = "/dev/dmx"; 49 50 50 if ( roar_vio_open_dstr(vio, dev ice, &def, 1) == -1 ) {51 if ( roar_vio_open_dstr(vio, dev, &def, 1) == -1 ) { 51 52 err = roar_error; 52 53 roar_mm_free(vio); -
roard/include/roard.h
r5740 r5754 162 162 163 163 #ifdef ROAR_SUPPORT_LISTEN 164 int get_listen(struct roard_listen ** sock, c har *** sockname);165 int add_listen (c har * addr, int port, int sock_type, char * user, char * group, int proto, int dir, struct roar_audio_info * info);164 int get_listen(struct roard_listen ** sock, const char *** sockname); 165 int add_listen (const char * addr, int port, int sock_type, char * user, char * group, int proto, int dir, struct roar_audio_info * info); 166 166 #endif 167 167 -
roard/roard.c
r5662 r5754 88 88 89 89 #ifdef ROAR_SUPPORT_LISTEN 90 static c har * server[ROAR_MAX_LISTEN_SOCKETS];90 static const char * server[ROAR_MAX_LISTEN_SOCKETS]; 91 91 #endif 92 92 … … 561 561 } 562 562 563 int get_listen(struct roard_listen ** sock, c har *** sockname) {563 int get_listen(struct roard_listen ** sock, const char *** sockname) { 564 564 int i; 565 565 … … 786 786 787 787 int get_listen_profile (const char * name, 788 int * port, c har ** sockaddr, int * type,788 int * port, const char ** sockaddr, int * type, 789 789 int * proto, 790 790 int * dir, struct roar_audio_info * info) { … … 798 798 799 799 if ( p->type == ROAR_SOCKET_TYPE_UNIX && p->sockaddr[0] != '+' ) { 800 roar_env_render_path_r(buf, sizeof(buf), p->sockaddr); 800 if ( roar_env_render_path_r(buf, sizeof(buf), p->sockaddr) == -1 ) 801 continue; 801 802 } else { 802 803 strncpy(buf, p->sockaddr, sizeof(buf)); … … 822 823 #endif 823 824 824 int add_listen (c har * addr, int port, int sock_type, char * user, char * group, int proto, int dir, struct roar_audio_info * info) {825 int add_listen (const char * addr, int port, int sock_type, char * user, char * group, int proto, int dir, struct roar_audio_info * info) { 825 826 #if defined(ROAR_HAVE_SETGID) && defined(ROAR_HAVE_IO_POSIX) 826 827 struct group * grp = NULL; … … 861 862 #ifdef ROAR_HAVE_UNIX 862 863 if ( *addr == '/' ) { 863 if ( (env_roar_proxy_backup = getenv("ROAR_PROXY")) != NULL ) {864 if ( (env_roar_proxy_backup = (char*)roar_env_get("ROAR_PROXY")) != NULL ) { 864 865 env_roar_proxy_backup = roar_mm_strdup(env_roar_proxy_backup); 865 866 unsetenv("ROAR_PROXY"); … … 1214 1215 // X11: 1215 1216 #ifdef ROAR_HAVE_LIBX11 1216 int register_x11 (int unreg, c har * sockname) {1217 int register_x11 (int unreg, const char * sockname) { 1217 1218 struct roar_x11_connection * x11con = NULL; 1218 1219 int ret = 0; … … 1252 1253 } 1253 1254 1254 int register_slp (int unreg, c har * sockname) {1255 int register_slp (int unreg, const char * sockname) { 1255 1256 #ifdef ROAR_HAVE_LIBSLP 1256 1257 static int regged = 0; 1257 static c har * sn = NULL;1258 static const char * sn = NULL; 1258 1259 SLPError err; 1259 1260 SLPError callbackerr; … … 1437 1438 #ifdef ROAR_SUPPORT_LISTEN 1438 1439 int port = ROAR_DEFAULT_PORT; 1439 c har * sock_addr = NULL;1440 const char * sock_addr = NULL; 1440 1441 int sock_proto = ROAR_PROTO_ROARAUDIO; 1441 1442 int sock_dir = -1; … … 1449 1450 int s_prim = 0; 1450 1451 #endif 1451 char * o_drv = getenv("ROAR_DRIVER");1452 char * o_dev = getenv("ROAR_DEVICE");1452 char * o_drv = NULL; 1453 char * o_dev = NULL; 1453 1454 char * o_opts = NULL; 1454 1455 int o_prim = 0; … … 1508 1509 ROAR_DBG("main(*): starting roard..."); 1509 1510 1511 // NOTE: those to lions can generate a memory leak. The OS will clean that up on exit. 1512 if ( roar_env_get("ROAR_DRIVER") != NULL ) 1513 o_drv = roar_mm_strdup(roar_env_get("ROAR_DRIVER")); 1514 if ( roar_env_get("ROAR_DEVICE") != NULL ) 1515 o_dev = roar_mm_strdup(roar_env_get("ROAR_DEVICE")); 1516 1510 1517 g_standby = 0; 1511 1518 g_autostandby = 0; … … 1603 1610 1604 1611 #ifdef ROAR_HAVE_GETUID 1605 if ( getuid() != 0 && getenv("HOME") != NULL ) {1612 if ( getuid() != 0 && roar_env_get("HOME") != NULL ) { 1606 1613 /* 1607 1614 snprintf(user_sock, 79, "%s/%s", (char*)getenv("HOME"), ROAR_DEFAULT_SOCK_USER); 1608 1615 */ 1609 roar_env_render_path_r(user_sock, sizeof(user_sock), "~/" ROAR_DEFAULT_SOCK_USER); 1616 if ( roar_env_render_path_r(user_sock, sizeof(user_sock), "~/" ROAR_DEFAULT_SOCK_USER) == -1 ) { 1617 strncpy(user_sock, "/NX-SOCK", sizeof(user_sock)); 1618 } 1610 1619 sock_addr = user_sock; 1611 1620 ROAR_DBG("main(*): setting sock_addr='%s'", sock_addr); … … 1613 1622 #endif 1614 1623 1615 if ( getenv("ROAR_SERVER") != NULL )1616 sock_addr = getenv("ROAR_SERVER");1624 if ( roar_env_get("ROAR_SERVER") != NULL ) 1625 sock_addr = roar_env_get("ROAR_SERVER"); 1617 1626 #endif 1618 1627
Note: See TracChangeset
for help on using the changeset viewer.