conf.c: code cleanup
This commit is contained in:
parent
7ef6cb4584
commit
391cf4e2a1
|
@ -303,11 +303,10 @@ Conf_Test( void )
|
|||
|
||||
/* Valid tty? */
|
||||
if(isatty(fileno(stdin)) && isatty(fileno(stdout))) {
|
||||
puts( "OK, press enter to see a dump of your service configuration ..." );
|
||||
puts("OK, press enter to see a dump of your server configuration ...");
|
||||
getchar();
|
||||
} else {
|
||||
} else
|
||||
puts("Ok, dump of your server configuration follows:\n");
|
||||
}
|
||||
|
||||
puts("[GLOBAL]");
|
||||
printf(" Name = %s\n", Conf_ServerName);
|
||||
|
@ -881,7 +880,9 @@ Read_Config( bool ngircd_starting )
|
|||
continue;
|
||||
}
|
||||
|
||||
Config_Error( LOG_ERR, "%s, line %d: Unknown section \"%s\"!", NGIRCd_ConfFile, line, section );
|
||||
Config_Error(LOG_ERR,
|
||||
"%s, line %d: Unknown section \"%s\"!",
|
||||
NGIRCd_ConfFile, line, section);
|
||||
section[0] = 0x1;
|
||||
}
|
||||
if( section[0] == 0x1 ) continue;
|
||||
|
@ -1050,8 +1051,8 @@ WarnPAM(int UNUSED Line)
|
|||
/**
|
||||
* Handle legacy "NoXXX" options in [GLOBAL] section.
|
||||
*
|
||||
* TODO: This function and support for "NoXXX" should be removed starting
|
||||
* with ngIRCd release 19! (One release after marking it "deprecated").
|
||||
* TODO: This function and support for "NoXXX" could be removed starting
|
||||
* with ngIRCd release 19 (one release after marking it "deprecated").
|
||||
*
|
||||
* @param Var Variable name.
|
||||
* @param Arg Argument string.
|
||||
|
@ -1236,7 +1237,8 @@ Handle_GLOBAL( int Line, char *Var, char *Arg )
|
|||
return;
|
||||
}
|
||||
if (!array_copyb(&Conf_Motd, Arg, len + 1))
|
||||
Config_Error(LOG_WARNING, "%s, line %d: Could not append MotdPhrase: %s",
|
||||
Config_Error(LOG_WARNING,
|
||||
"%s, line %d: Could not append MotdPhrase: %s",
|
||||
NGIRCd_ConfFile, Line, strerror(errno));
|
||||
Using_MotdFile = false;
|
||||
return;
|
||||
|
@ -1281,7 +1283,11 @@ Handle_GLOBAL( int Line, char *Var, char *Arg )
|
|||
}
|
||||
|
||||
if (CheckLegacyNoOption(Var, Arg)) {
|
||||
Config_Error(LOG_WARNING, "%s, line %d: \"No\"-Prefix has been removed, use \"%s = %s\" in [FEATURES] section instead",
|
||||
/* TODO: This function and support for "NoXXX" could be
|
||||
* be removed starting with ngIRCd release 19 (one release
|
||||
* after marking it "deprecated"). */
|
||||
Config_Error(LOG_WARNING,
|
||||
"%s, line %d (section \"Global\"): \"No\"-Prefix is deprecated, use \"%s = %s\" in [Options] section!",
|
||||
NGIRCd_ConfFile, Line, NoNo(Var), InvertArg(Arg));
|
||||
if (strcasecmp(Var, "NoIdent") == 0)
|
||||
WarnIdent(Line);
|
||||
|
|
Loading…
Reference in New Issue