Changeset 5766:f5bfde2f4b12 in roaraudio

Timestamp:

11/21/12 17:14:54 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added ROAR_VIO_DSTR_PEF_ALLOW_ABSOLUTE as well as ROAR_VIO_DSTR_PEF_ALLOW_ALL (required by uste)

Files:

• include/libroar/vio_dstr.h (modified) (1 diff)
• libroar/vio_dstr.c (modified) (1 diff)

include/libroar/vio_dstr.h

@@ -187 +187 @@
 
  // PEF = Path Element Flag
-#define ROAR_VIO_DSTR_PEF_NONE          0x0000
-#define ROAR_VIO_DSTR_PEF_IS_DIR        0x0001
-#define ROAR_VIO_DSTR_PEF_ALLOW_MULTI   0x0100
-#define ROAR_VIO_DSTR_PEF_ALLOW_PARENT  0x0200
+#define ROAR_VIO_DSTR_PEF_NONE           0x0000
+#define ROAR_VIO_DSTR_PEF_IS_DIR         0x0001
+#define ROAR_VIO_DSTR_PEF_ALLOW_MULTI    0x0100
+#define ROAR_VIO_DSTR_PEF_ALLOW_PARENT   0x0200
+#define ROAR_VIO_DSTR_PEF_ALLOW_ABSOLUTE 0x0400
+#define ROAR_VIO_DSTR_PEF_ALLOW_ALL      (ROAR_VIO_DSTR_PEF_ALLOW_MULTI|ROAR_VIO_DSTR_PEF_ALLOW_PARENT|ROAR_VIO_DSTR_PEF_ALLOW_ABSOLUTE)
 
 int           roar_vio_dstr_get_type(const char * str);

libroar/vio_dstr.c

@@ -1066 +1066 @@
 
   if ( strstr(elements[i].dstr, ":") != NULL ) {
+   if ( !(elements[i].flags & ROAR_VIO_DSTR_PEF_ALLOW_ABSOLUTE) ) {
+    roar_err_set(ROAR_ERROR_INVAL);
+    return NULL;
+   }
    rootelement = i;
    needed = 0;