X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=main.c;h=ac715d5b4186bc1d18cff1e6a2b16a154dff1dc3;hp=9f533b63c2c3a4ce427f34ff86653b1c6e6867bd;hb=a7b45ea14dd05ac141f7f220568fa4757ff98a03;hpb=0a00807e57ee1c84b3c0e8105c3e735bfebd7965 diff --git a/main.c b/main.c index 9f533b6..ac715d5 100644 --- a/main.c +++ b/main.c @@ -1,26 +1,3 @@ -/* - * Copyright (C) 2012, 2013, 2014, 2015 - * Dale Weiler - * Wolfgang Bumiller - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ #include #include @@ -59,8 +36,7 @@ static int usage(void) { con_out("usage: %s [options] [files...]", app_name); con_out("options:\n" " -h, --help show this help message\n" - " -debug turns on compiler debug messages\n" - " -memchk turns on compiler memory leak check\n"); + " -debug turns on compiler debug messages\n"); con_out(" -o, --output=file output file, defaults to progs.dat\n" " -s filename add a progs.src file to be used\n"); con_out(" -E stop after preprocessing\n"); @@ -144,14 +120,13 @@ static bool options_long_gcc(const char *optname, int *argc_, char ***argv_, cha static bool options_parse(int argc, char **argv) { bool argend = false; size_t itr; - char buffer[1024]; - char *config = NULL; - char *memdumpcols = NULL; + char buffer[1024]; + char *config = NULL; while (!argend && argc > 1) { char *argarg; argitem item; - ppitem macro; + ppitem macro; ++argv; --argc; @@ -225,10 +200,6 @@ static bool options_parse(int argc, char **argv) { config = argarg; continue; } - if (options_long_gcc("memdumpcols", &argc, &argv, &memdumpcols)) { - OPTS_OPTION_U16(OPTION_MEMDUMPCOLS) = (uint16_t)strtol(memdumpcols, NULL, 10); - continue; - } if (options_long_gcc("progsrc", &argc, &argv, &argarg)) { OPTS_OPTION_STR(OPTION_PROGSRC) = argarg; continue; @@ -269,10 +240,6 @@ static bool options_parse(int argc, char **argv) { OPTS_OPTION_BOOL(OPTION_DUMPFIN) = true; continue; } - if (!strcmp(argv[0]+1, "memchk")) { - OPTS_OPTION_BOOL(OPTION_MEMCHK) = true; - continue; - } if (!strcmp(argv[0]+1, "nocolor")) { con_color(0); continue;