Reshuffle version printing so -V prints it only once.

remotes/origin/master-1.2.x
Victor Julien 14 years ago
parent 1bebb9831d
commit 08f3ef7685

@ -479,6 +479,12 @@ void SCPrintBuildInfo(void) {
char *endian = "<unknown>-endian"; char *endian = "<unknown>-endian";
char features[2048] = ""; char features[2048] = "";
#ifdef REVISION
SCLogInfo("This is %s version %s (rev %s)", PROG_NAME, PROG_VER, xstr(REVISION));
#else
SCLogInfo("This is %s version %s", PROG_NAME, PROG_VER);
#endif
#ifdef DEBUG #ifdef DEBUG
strlcat(features, "DEBUG ", sizeof(features)); strlcat(features, "DEBUG ", sizeof(features));
#endif #endif
@ -653,12 +659,6 @@ int main(int argc, char **argv)
} }
#endif /* OS_WIN32 */ #endif /* OS_WIN32 */
#ifdef REVISION
SCLogInfo("This is %s version %s (rev %s)", PROG_NAME, PROG_VER, xstr(REVISION));
#else
SCLogInfo("This is %s version %s", PROG_NAME, PROG_VER);
#endif
/* Initialize the configuration module. */ /* Initialize the configuration module. */
ConfInit(); ConfInit();
@ -1077,6 +1077,13 @@ int main(int argc, char **argv)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
} }
#ifdef REVISION
SCLogInfo("This is %s version %s (rev %s)", PROG_NAME, PROG_VER, xstr(REVISION));
#else
SCLogInfo("This is %s version %s", PROG_NAME, PROG_VER);
#endif
SetBpfString(optind, argv); SetBpfString(optind, argv);
UtilCpuPrintSummary(); UtilCpuPrintSummary();

Loading…
Cancel
Save