[xiph-cvs] cvs commit: icecast/src config.c

[Michael Smith]

msmith      02/08/09 10:47:54

  Modified:    src      config.c
  Log:
  set default webroot dir correctly, and fix a minor memleak

Revision  Changes    Path
1.13      +3 -0      icecast/src/config.c

Index: config.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/config.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- config.c	9 Aug 2002 14:36:12 -0000	1.12
+++ config.c	9 Aug 2002 14:47:53 -0000	1.13
@@ -74,6 +74,8 @@
         xmlFree(c->base_dir);
         if (c->log_dir && c->log_dir != CONFIG_DEFAULT_LOG_DIR) 
         xmlFree(c->log_dir);
+    if (c->webroot_dir && s->webroot_dir != CONFIG_DEFAULT_WEBROOT_DIR)
+        xmlFree(c->webroot_dir);
         if (c->access_log && c->access_log != CONFIG_DEFAULT_ACCESS_LOG) 
         xmlFree(c->access_log);
         if (c->error_log && c->error_log != CONFIG_DEFAULT_ERROR_LOG) 
@@ -160,6 +162,7 @@
     _configuration.master_update_interval = CONFIG_MASTER_UPDATE_INTERVAL;
         _configuration.base_dir = CONFIG_DEFAULT_BASE_DIR;
         _configuration.log_dir = CONFIG_DEFAULT_LOG_DIR;
+    _configuration.webroot_dir = CONFIG_DEFAULT_WEBROOT_DIR;
         _configuration.access_log = CONFIG_DEFAULT_ACCESS_LOG;
         _configuration.error_log = CONFIG_DEFAULT_ERROR_LOG;
         _configuration.loglevel = CONFIG_DEFAULT_LOG_LEVEL;

<p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.