nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

minor cleaning

Browse source
This commit is contained in:
fluxgen 2002-08-13 23:56:02 +00:00
parent 4a5917731c
commit 8cc792e534
1 changed files with 21 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/main.cc
View file

@ -22,12 +22,12 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: main.cc,v 1.6 2002/04/04 11:28:19 fluxgen Exp $ // $Id: main.cc,v 1.7 2002/08/13 23:56:02 fluxgen Exp $
//use GNU extensions
#ifndef _GNU_SOURCE
#define _GNU_SOURCE #include "i18n.hh"
#endif // _GNU_SOURCE #include "fluxbox.hh"
#include "../version.h" #include "../version.h"
@ -35,17 +35,14 @@
#include "../config.h" #include "../config.h"
#endif // HAVE_CONFIG_H #endif // HAVE_CONFIG_H
#include "i18n.hh" //use GNU extensions
#include "fluxbox.hh" #ifndef _GNU_SOURCE
#define _GNU_SOURCE
#endif // _GNU_SOURCE
#ifdef HAVE_STDIO_H #include <cstdio>
# include <stdio.h> #include <cstdlib>
#endif // HAVE_STDIO_H #include <cstring>
#ifdef STDC_HEADERS
# include <stdlib.h>
# include <string.h>
#endif // STDC_HEADERS
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
#include <sys/types.h> #include <sys/types.h>
@ -71,6 +68,7 @@ using namespace std;
uds::uds_flags_t uds::flags = uds::leak_check; uds::uds_flags_t uds::flags = uds::leak_check;
#endif //!DEBUG_UDS #endif //!DEBUG_UDS
const char *getNLSYesNoMsg(bool val) { const char *getNLSYesNoMsg(bool val) {
if (val) { if (val) {
return I18n::instance()->getMessage( return I18n::instance()->getMessage(
@ -132,13 +130,12 @@ int main(int argc, char **argv) {
"warning: couldn't set environment variable 'DISPLAY'\n")); "warning: couldn't set environment variable 'DISPLAY'\n"));
perror("putenv()"); perror("putenv()");
} }
} else if (! strcmp(argv[i], "-version")) { } else if (strcmp(argv[i], "-version") == 0) {
// print current version string // print current version string
printf("Fluxbox %s : (c) 2001-2002 Henrik Kinnunen \n\n", printf("Fluxbox %s : (c) 2001-2002 Henrik Kinnunen \n\n",
__fluxbox_version); __fluxbox_version);
exit(0); exit(0);
} else if (! strcmp(argv[i], "-help")) { } else if (strcmp(argv[i], "-help") == 0) {
// print program usage and command line options // print program usage and command line options
printf(i18n-> printf(i18n->
getMessage( getMessage(