Commit 0e99bcba authored by claes's avatar claes

More mysql

parent 4d51d968
/* /*
* Proview $Id: wb_lfu.cpp,v 1.10 2008-02-04 13:34:49 claes Exp $ * Proview $Id: wb_lfu.cpp,v 1.11 2008-02-22 09:23:44 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB. * Copyright (C) 2005 SSAB Oxelsund AB.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -2514,12 +2514,16 @@ pwr_tStatus lfu_GetVolumeCnf( char *name, pwr_tVid *vid, pwr_tCid *cid, ldh_eVol ...@@ -2514,12 +2514,16 @@ pwr_tStatus lfu_GetVolumeCnf( char *name, pwr_tVid *vid, pwr_tCid *cid, ldh_eVol
pwr_tStatus lfu_ParseDbmsServer( char *server, char *user, char *password, pwr_tStatus lfu_ParseDbmsServer( char *server, char *user, char *password,
unsigned int *port, char *host) unsigned int *port, char *host)
{ {
char lserver[80];
if ( strcmp( server, "") == 0) { if ( strcmp( server, "") == 0) {
if ( !cnf_get_value( "mysqlServer", host)) { if ( !cnf_get_value( "mysqlServer", lserver)) {
printf( "** mysql Server not defined\n"); printf( "** mysql Server not defined\n");
return LDH__NOSERVER; return LDH__NOSERVER;
} }
} }
else
strcpy( lserver, server);
// Parse server string: username:password@port:host // Parse server string: username:password@port:host
char lhost[80]; char lhost[80];
...@@ -2529,11 +2533,11 @@ pwr_tStatus lfu_ParseDbmsServer( char *server, char *user, char *password, ...@@ -2529,11 +2533,11 @@ pwr_tStatus lfu_ParseDbmsServer( char *server, char *user, char *password,
char str2[2][80]; char str2[2][80];
int nr; int nr;
nr = dcli_parse( server, "@", "", (char *)str1, nr = dcli_parse( lserver, "@", "", (char *)str1,
sizeof( str1) / sizeof( str1[0]), sizeof( str1[0]), 0); sizeof( str1) / sizeof( str1[0]), sizeof( str1[0]), 0);
if ( nr == 1) if ( nr == 1)
strncpy( lhost, server, sizeof(lhost)); strncpy( lhost, lserver, sizeof(lhost));
else if ( nr >= 2) { else if ( nr >= 2) {
strncpy( lhost, str1[1], sizeof(lhost)); strncpy( lhost, str1[1], sizeof(lhost));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment