mirror/zoneminder
1
0 Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-10-24 15:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bug 232 - Revamped build and install

Browse Source 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1678 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan committed 2005-12-16 10:13:59 +00:00
1 parent ee29d392cf
commit a35a06dc1d
2 files changed
+9 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/zm_config.cpp
+8 -5
View File
@@ -24,7 +24,7 @@
#include "zm.h"
#include "zm_db.h"
char *ZM_DB_SERVER="", *ZM_DB_NAME="", *ZM_DB_USER="", *ZM_DB_PASS="";
char *ZM_DB_HOST="", *ZM_DB_NAME="", *ZM_DB_USER="", *ZM_DB_PASS="", *ZM_PATH_WEB="";
void zmLoadConfig()
{
@@ -32,7 +32,7 @@ void zmLoadConfig()
char line[512];
char *val;
int r;
if (( cfg = fopen( ZM_CONFIG, "r" )) == NULL )
if ( (cfg = fopen( ZM_CONFIG, "r")) == NULL )
{
Fatal(("Can't open %s: %s", ZM_CONFIG, strerror(errno) ));
}
@@ -56,7 +56,7 @@ void zmLoadConfig()
char *temp_ptr = line_ptr+strlen(line_ptr)-1;
while ( *temp_ptr == ' ' || *temp_ptr == '\t' )
{
*temp_ptr = '\0';
*temp_ptr-- = '\0';
temp_ptr--;
}
@@ -87,13 +87,16 @@ void zmLoadConfig()
val = (char *)malloc( strlen(val_ptr)+1 );
strncpy( val, val_ptr, strlen(val_ptr)+1 );
if ( strcasecmp( name_ptr, "ZM_DB_SERVER" ) == 0 ) ZM_DB_SERVER = val;
if ( strcasecmp( name_ptr, "ZM_DB_HOST" ) == 0 ) ZM_DB_HOST = val;
else if ( strcasecmp( name_ptr, "ZM_DB_NAME" ) == 0 ) ZM_DB_NAME = val;
else if ( strcasecmp( name_ptr, "ZM_DB_USER" ) == 0 ) ZM_DB_USER = val;
else if ( strcasecmp( name_ptr, "ZM_DB_PASS" ) == 0 ) ZM_DB_PASS = val;
else if ( strcasecmp( name_ptr, "ZM_PATH_WEB" ) == 0 ) ZM_PATH_WEB = val;
else
{
Warning(( "Invalid parameter '%s' in %s", name_ptr, ZM_CONFIG ));
// We ignore this now as there may be more parameters than the
// c/c++ binaries are bothered about
// Warning(( "Invalid parameter '%s' in %s", name_ptr, ZM_CONFIG ));
}
}
fclose( cfg);
src/zm_db.cpp
+1 -1
View File
@@ -31,7 +31,7 @@ void zmDbConnect()
Error(( "Can't initialise structure: %s", mysql_error( &dbconn ) ));
exit( mysql_errno( &dbconn ) );
}
if ( !mysql_real_connect( &dbconn, ZM_DB_SERVER, ZM_DB_USER, ZM_DB_PASS, 0, 0, 0, 0 ) )
if ( !mysql_real_connect( &dbconn, ZM_DB_HOST, ZM_DB_USER, ZM_DB_PASS, 0, 0, 0, 0 ) )
{
Error(( "Can't connect to server: %s", mysql_error( &dbconn ) ));
exit( mysql_errno( &dbconn ) );