Allow only one camera on at a time.

[matches/MCTX3420.git] / server / data.c

diff --git a/server/data.c b/server/data.c
index add8d9f..dae3172 100644 (file)
--- a/server/data.c
+++ b/server/data.c
@@ -1,6 +1,6 @@
 /**
  * @file data.c
- * @purpose Implementation of data handling functions; saving, loading, displaying, selecting.
+ * @brief Implementation of data handling functions; saving, loading, displaying, selecting.
  */
 
 #include "data.h"
@@ -13,9 +13,8 @@
 void Data_Init(DataFile * df)
 {
        // Everything is NULL
-       df->filename = NULL;
+       memset(df, 0, sizeof(DataFile));
        pthread_mutex_init(&(df->mutex), NULL);
-       df->file = NULL;
 }
 
 /**
@@ -344,7 +343,7 @@ void Data_Handler(DataFile * df, FCGIValue * start, FCGIValue * end, DataFormat
  */
 DataFormat Data_GetFormat(FCGIValue * fmt)
 {
-       char * fmt_str = *(char**)(fmt->value);
+       const char * fmt_str = *(const char**)(fmt->value);
        // Check if format type was specified
        if (FCGI_RECEIVED(fmt->flags))
        {