Changeset 5227:beb26bba0901 in roaraudio for libroar

Timestamp:

11/12/11 13:26:38 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added const keywords to roar_vio_open_dstr(), roar_vio_open_dstr_vio(), roar_vs_file_simple() and roar_vs_new_from_file()

Location:

libroar

Files:

• vio_dstr.c (modified) (3 diffs)
• vs.c (modified) (2 diffs)

libroar/vio_dstr.c

@@ -360 +360 @@
 #endif
 
-int     roar_vio_open_dstr    (struct roar_vio_calls * calls, char * dstr, struct roar_vio_defaults * def, int dnum) {
+int     roar_vio_open_dstr    (struct roar_vio_calls * calls, const char * dstr, struct roar_vio_defaults * def, int dnum) {
  return roar_vio_open_dstr_vio(calls, dstr, def, dnum, NULL);
 }
 
-#define _ret(x) do { int _err = roar_error; roar_mm_free(dstr); roar_error = _err; roar_err_to_errno(); return (x); } while (0)
+#define _ret(x) do { int _err = roar_error; roar_mm_free(dstr_copy); roar_error = _err; roar_err_to_errno(); return (x); } while (0)
 
 int     roar_vio_open_dstr_vio(struct roar_vio_calls * calls,
-                               char * dstr, struct roar_vio_defaults * def, int dnum,
+                               const char * dstr, struct roar_vio_defaults * def, int dnum,
                                struct roar_vio_calls * vio) {
 #ifndef ROAR_WITHOUT_VIO_DSTR
  struct roar_vio_dstr_chain chain[ROAR_VIO_DSTR_MAX_OBJ_PER_CHAIN];
+ char * dstr_copy;
  char * next;
  char * this;
@@ -387 +388 @@
   return -1;
 
- if ( (dstr = roar_mm_strdup(dstr)) == NULL )
+ if ( (dstr_copy = roar_mm_strdup(dstr)) == NULL )
   return -1;
 
@@ -394 +395 @@
  chain[0].type = ROAR_VIO_DSTR_OBJT_INTERNAL;
 
- next = dstr;
+ next = dstr_copy;
 
  while (next != NULL) {

libroar/vs.c

@@ -408 +408 @@
 }
 
-int roar_vs_file_simple(roar_vs_t * vss, char * filename, int * error) {
+int roar_vs_file_simple(roar_vs_t * vss, const char * filename, int * error) {
  struct roar_vio_defaults def;
  struct roar_vio_calls * file;
@@ -495 +495 @@
 }
 
-roar_vs_t * roar_vs_new_from_file(const char * server, const char * name, char * filename, int * error) {
+roar_vs_t * roar_vs_new_from_file(const char * server, const char * name, const char * filename, int * error) {
  roar_vs_t * vss = roar_vs_new(server, name, error);