Changeset 5534:ea9da1d777c7 in roaraudio for roarclients/roarvorbis.c

Timestamp:

06/12/12 14:59:42 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Done more hardending work.

File:

• roarclients/roarvorbis.c (modified) (4 diffs)

roarclients/roarvorbis.c

@@ -97 +97 @@
                    roar_vs_t              ** vss,
                    OggVorbis_File         *  vf,
-                   char                   *  file,
+                   const char             *  file,
                    struct roar_audio_info *  info,
                    struct roar_vio_calls  *  vclt) {
@@ -288 +288 @@
  struct roar_vio_calls vclt, in;
  struct roar_vio_defaults def;
- char * server   = NULL;
- char * file     = NULL;
- char * vcltfile = NULL;
- char * k;
+ const char * file     = NULL;
+ const char * vcltfile = NULL;
+ const char * k;
  int    i;
  struct roar_connection con;
@@ -310 +309 @@
 
   if ( strcmp(k, "--server") == 0 ) {
-   server = argv[++i];
+   roar_libroar_set_server(argv[++i]);
   } else if ( strcmp(k, "--vclt-out") == 0 ) {
    vcltfile = argv[++i];
@@ -325 +324 @@
  }
 
- roar_libroar_set_server(server);
-
  if ( file == NULL ) {
   ROAR_ERR("No filename given.");