Changeset 5754:b23d79c13370 in roaraudio for roard/driver_dmx.c

Timestamp:

11/16/12 16:49:56 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

avoid getenv() and use more portable roar_env_get(). Also improved security as we enfore const now on bufferes obtained from the env.

File:

• roard/driver_dmx.c (modified) (2 diffs)

roard/driver_dmx.c

@@ -32 +32 @@
  struct roar_vio_calls * vio;
  int err;
+ const char * dev = device;
 
  if ( roar_vio_dstr_init_defaults(&def, ROAR_VIO_DEF_TYPE_NONE, O_WRONLY, 0644) == -1 )
@@ -42 +43 @@
 
  if ( fh == -1 ) {
-  if ( device == NULL )
-   device = getenv("DMX");
+  if ( dev == NULL )
+   dev = roar_env_get("DMX");
 
-  if ( device == NULL )
-   device = "/dev/dmx";
+  if ( dev == NULL )
+   dev = "/dev/dmx";
 
-  if ( roar_vio_open_dstr(vio, device, &def, 1) == -1 ) {
+  if ( roar_vio_open_dstr(vio, dev, &def, 1) == -1 ) {
    err = roar_error;
    roar_mm_free(vio);