Skip to content

Commit b15cd4b

Browse files
author
rkesarwa
committed
Minor Code formatting.
1 parent 557336b commit b15cd4b

File tree

5 files changed

+56
-58
lines changed

5 files changed

+56
-58
lines changed

‎BaseClient/kvs.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ static void create_pair(CybsMap *store, const void *key, void *value) {
7575
//pair->key = key;
7676
//pair->value = value;
7777
pair->value = (char *) malloc(valueCopy.size() + sizeof(char));
78-
if(!pair->value) {
79-
mem_alloc_error();
80-
exit(0);
81-
}
78+
if(!pair->value) {
79+
mem_alloc_error();
80+
exit(0);
81+
}
8282
valueCopy.copy((char *)pair->value, valueCopy.size(), 0);
8383
((char *) pair->value)[valueCopy.size()]='\0';
8484
sort_pairs(store);
@@ -97,7 +97,7 @@ static void remove_pair(CybsMap *store, CybsTable *pair) {
9797
}
9898

9999
CybsMap *cybs_create_map(void) {
100-
CybsMap *store = (CybsMap *)malloc(kvs_store_size);
100+
CybsMap *store = (CybsMap *)malloc(kvs_store_size);
101101
if(!store) {
102102
mem_alloc_error();
103103
exit(0);
@@ -150,10 +150,10 @@ void cybs_add(CybsMap *store, const void *key, void *value) {
150150
free (pair->value);
151151
string valueCopy((char *)value);
152152
pair->value = (char *) malloc(valueCopy.size() + sizeof(char));
153-
if(!pair->value) {
154-
mem_alloc_error();
155-
exit(0);
156-
}
153+
if(!pair->value) {
154+
mem_alloc_error();
155+
exit(0);
156+
}
157157
valueCopy.copy((char *) pair->value, valueCopy.size(), 0);
158158
((char *) pair->value)[valueCopy.size()]='\0';
159159
} else {
@@ -169,7 +169,7 @@ void cybs_add(CybsMap *store, const void *key, void *value) {
169169
}
170170

171171
void *cybs_get(CybsMap *store, const void *key) {
172-
CybsTable *pair = get_pair(store, key);
172+
CybsTable *pair = get_pair(store, key);
173173
return pair ? pair->value : NULL;
174174
}
175175

‎BaseClient/util.c

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -64,32 +64,31 @@ static void trim( char **pszString )
6464
void cybs_load_config (const char *configFilename, CybsMap *map) {
6565
char szLine[256];
6666
char *szName, *szValue;
67-
std::string nextLine;
67+
std::string nextLine;
6868
int i = 0;
6969

70-
std::ifstream f(configFilename);
71-
if(!f.is_open()) {
72-
(CybsMap *) 0;
70+
std::ifstream f(configFilename);
71+
if(!f.is_open()) {
72+
(CybsMap *) 0;
7373
}else {
7474
//CybsMap *cybsConfig = cybs_create_map();
75-
while (getline(f, nextLine)) {
76-
strcpy(szLine, nextLine.c_str());
77-
split( szLine, &szName, &szValue );
78-
string szValueCopy(szValue);
79-
if (szValue && !szValueCopy.size() == 0)
80-
{
81-
trim( &szName );
82-
if (szName[0] != INI_COMMENT_CHAR)
83-
{
84-
trim( &szValue );
85-
cybs_add(map, szName, szValue);
86-
i = i + 1;
87-
}
88-
}
89-
}
90-
91-
f.close();
92-
}
75+
while (getline(f, nextLine)) {
76+
strcpy(szLine, nextLine.c_str());
77+
split( szLine, &szName, &szValue );
78+
string szValueCopy(szValue);
79+
if (szValue && !szValueCopy.size() == 0)
80+
{
81+
trim( &szName );
82+
if (szName[0] != INI_COMMENT_CHAR)
83+
{
84+
trim( &szValue );
85+
cybs_add(map, szName, szValue);
86+
i = i + 1;
87+
}
88+
}
89+
}
90+
f.close();
91+
}
9392
}
9493

9594

‎NVPClient/NVPClient.cpp

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -632,18 +632,17 @@ int runTransaction(INVPTransactionProcessorProxy *proxy, CybsMap *configMap, std
632632

633633
}
634634

635-
if(CLIENT_LIBRARY_VERSION != NULL)
636-
req[CLIENT_LIBRARY_VERSION] = CLIENT_LIBRARY_VERSION_VALUE;
635+
if(CLIENT_LIBRARY_VERSION != NULL)
636+
req[CLIENT_LIBRARY_VERSION] = CLIENT_LIBRARY_VERSION_VALUE;
637637

638-
if(CLIENT_LIBRARY != NULL)
639-
req[CLIENT_LIBRARY] = CLIENT_LIBRARY_VALUE;
638+
if(CLIENT_LIBRARY != NULL)
639+
req[CLIENT_LIBRARY] = CLIENT_LIBRARY_VALUE;
640640

641-
if(CLIENT_ENVIRONMENT != NULL)
642-
req[CLIENT_ENVIRONMENT] = CLIENT_ENVIRONMENT_VALUE;
643-
644-
if(CLIENT_APPLICATION != NULL)
645-
req[CLIENT_APPLICATION] = CLIENT_APPLICATION_VALUE;
641+
if(CLIENT_ENVIRONMENT != NULL)
642+
req[CLIENT_ENVIRONMENT] = CLIENT_ENVIRONMENT_VALUE;
646643

644+
if(CLIENT_APPLICATION != NULL)
645+
req[CLIENT_APPLICATION] = CLIENT_APPLICATION_VALUE;
647646

648647
if (cfg.isLogEnabled)
649648
cybs_log_NVP(cfg, req, CYBS_LT_REQUEST);
@@ -706,10 +705,10 @@ int getKeyFilePath (char szDest[], char *szDir, const char *szFilename, char *ex
706705
szDirCopy.copy(szDest, szDirCopy.size(), 0);
707706
if (fAddSeparator)
708707
{
709-
if(nDirLen < 0)
710-
{
711-
throw std::out_of_range("Invalid index");
712-
}
708+
if(nDirLen < 0)
709+
{
710+
throw std::out_of_range("Invalid index");
711+
}
713712
szDest[nDirLen] = DIR_SEPARATOR;
714713
szDest[nDirLen + 1] = '\0';
715714
}
@@ -719,10 +718,10 @@ int getKeyFilePath (char szDest[], char *szDir, const char *szFilename, char *ex
719718
for(i = 0; i < szDestCopy.size(); i++) {
720719
szDest[i]=szDestCopy[i];
721720
}
722-
if(i < 0 || i > szDestCopy.size())
723-
{
724-
throw std::out_of_range("Invalid index");
725-
}
721+
if(i < 0 || i > szDestCopy.size())
722+
{
723+
throw std::out_of_range("Invalid index");
724+
}
726725
szDest[i]='\0';
727726
return( 0 );
728727

‎XMLClient/XMLClient.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -690,10 +690,10 @@ int getKeyFilePath (char szDest[], char *szDir, const char *szFilename, char *ex
690690

691691
if (fAddSeparator)
692692
{
693-
if(nDirLen < 0)
694-
{
695-
throw std::out_of_range("Invalid index");
696-
}
693+
if(nDirLen < 0)
694+
{
695+
throw std::out_of_range("Invalid index");
696+
}
697697
szDest[nDirLen] = DIR_SEPARATOR;
698698
szDest[nDirLen + 1] = '\0';
699699
}
@@ -704,10 +704,10 @@ int getKeyFilePath (char szDest[], char *szDir, const char *szFilename, char *ex
704704
szDest[i]=szDestCopy[i];
705705
}
706706

707-
if(i < 0 || i > szDestCopy.size())
708-
{
709-
throw std::out_of_range("Invalid index");
710-
}
707+
if(i < 0 || i > szDestCopy.size())
708+
{
709+
throw std::out_of_range("Invalid index");
710+
}
711711
szDest[i]='\0';
712712
return( 0 );
713713

‎xml/xml.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ char* getInputXML (const char* xmlfile) {
3232
if (fp) {
3333
fseek( fp, 0, SEEK_END );
3434
size = ftell( fp );
35-
fseek( fp, 0, SEEK_SET );
35+
fseek( fp, 0, SEEK_SET );
3636
src = (char *) malloc( size+1 );
3737

3838
if( src ) {

0 commit comments

Comments
 (0)