bbs/deb-goldedplus
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

namespace fixed

Browse Source
This commit is contained in:
Alexander S. Aganichev 2002-05-31 13:54:14 +00:00
parent 389bf63f62
commit b84eed4ea2
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
goldnode/goldnode.cpp
View File

@ -875,7 +875,7 @@ static void read_nodelists() {
// At last, sort the nodes // At last, sort the nodes
FILE *fp, *fido; FILE *fp, *fido;
geidxlist::iterator curr, prev; geidxlist::iterator curr, prev;
map<long, dword> namepos; std::map<long, dword> namepos;
// Sort by name // Sort by name
if(not quiet) std::cout << std::endl << "* Sorting by name " << std::flush; if(not quiet) std::cout << std::endl << "* Sorting by name " << std::flush;
@ -1128,11 +1128,11 @@ static int do_if(char* val) {
// ------------------------------------------------------------------ // ------------------------------------------------------------------
char* MapPath(char* map, bool reverse) { char* MapPath(char* fmap, bool reverse) {
Path buf, cmap; Path buf, cmap;
strxcpy(cmap, map, sizeof(Path)); strxcpy(cmap, fmap, sizeof(Path));
if(reverse) if(reverse)
strchg(cmap, GOLD_WRONG_SLASH_CHR, GOLD_SLASH_CHR); strchg(cmap, GOLD_WRONG_SLASH_CHR, GOLD_SLASH_CHR);
@ -1141,8 +1141,8 @@ char* MapPath(char* map, bool reverse) {
const char* p = reverse ? i->second.c_str() : i->first.c_str(); const char* p = reverse ? i->second.c_str() : i->first.c_str();
const char* q = reverse ? i->first.c_str() : i->second.c_str(); const char* q = reverse ? i->first.c_str() : i->second.c_str();
if(strnieql(cmap, p, strlen(p))) { if(strnieql(cmap, p, strlen(p))) {
strxcpy(buf, map, sizeof(Path)); strxcpy(buf, fmap, sizeof(Path));
strxmerge(map, sizeof(Path), q, buf+strlen(p), NULL); strxmerge(fmap, sizeof(Path), q, buf+strlen(p), NULL);
char sl1, sl2; char sl1, sl2;
char* ptr; char* ptr;
@ -1152,12 +1152,12 @@ char* MapPath(char* map, bool reverse) {
sl2 = ptr ? *ptr : NUL; sl2 = ptr ? *ptr : NUL;
if(sl1 and sl2 and (sl1 != sl2)) if(sl1 and sl2 and (sl1 != sl2))
strchg(map, sl1, sl2); strchg(fmap, sl1, sl2);
break; break;
} }
} }
return map; return fmap;
} }
@ -1218,7 +1218,7 @@ static int parse_config(const char *__configfile, Addr& zoneaddr) {
in_if = in_else = NO; in_if = in_else = NO;
cond_status = YES; cond_status = YES;
break; break;
default: default:
_gotcond = NO; _gotcond = NO;
break; break;
} }