Random stuff.

[polintos/scott/priv.git] / idlcomp / main.cc

diff --git a/idlcomp/main.cc b/idlcomp/main.cc
index 8abda4e7320761f9c27fcab81994472eea2dba8a..00c2151b89ced4d7c71101129e9156cb186179aa 100644 (file)
--- a/idlcomp/main.cc
+++ b/idlcomp/main.cc
@@ -2,23 +2,15 @@
 //
 // This software is copyright (c) 2006 Scott Wood <scott@buserror.net>.
 // 
-// Permission is hereby granted, free of charge, to any person obtaining a copy of
-// this software and associated documentation files (the "Software"), to deal with
-// 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 condition:
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors or contributors be held liable for any damages
+// arising from the use of this software.
 // 
-// 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
-// CONTRIBUTORS 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 WITH THE
-// SOFTWARE.
+// Permission is hereby granted to everyone, free of charge, to use, copy,
+// modify, prepare derivative works of, publish, distribute, perform,
+// sublicense, and/or sell copies of the Software, provided that the above
+// copyright notice and disclaimer of warranty be included in all copies or
+// substantial portions of this software.
 //
 // The idlc program implements two main functions.  One is to turn
 // .idl files into binary type descriptions.  The other is to turn
@@ -137,8 +129,8 @@ const char *cmdname, *output_dir, *cur_input_file = "<none>", *output_ns_name;
 list<const char *> inputs;
 list<NameSpaceRef> nspace_stack;
 Language *first_lang, *output_lang;
-Interface *System_Object;
-Struct *System_VStruct;
+InterfaceRef System_Object;
+StructRef System_VStruct;
 AutoReleasePool autorelease_pool;
 
 void print_usage()
@@ -357,7 +349,7 @@ static void longopt(const char *s, const char *arg)
        } else if (!strcmp(s, "show-targets")) {
                printf("Supported target architectures:\n");
                for (int i = 1; i <= max_target; i++)
-                       printf("   %s\n", targets[i].name);
+                       printf("   %s\n", targets[i].name);
                printf("\n");
                exit(0);
        } else if (!strcmp(s, "server")) {
@@ -369,7 +361,7 @@ static void longopt(const char *s, const char *arg)
 }
 
 static int global_argc;
-static const char **global_argv;
+static char **global_argv;
 static int got_dashdash;
 
 static void process_args(void)
@@ -380,7 +372,7 @@ static void process_args(void)
        
        for (i = 1; i < global_argc; i++) {
                if (global_argv[i][0] == '-' && global_argv[i][1] && !got_dashdash) {
-                       const char *opt = global_argv[i];
+                       char *opt = global_argv[i];
                
                        if (opt[1] == '-') {
                                if (!opt[2]) {
@@ -727,7 +719,7 @@ void language_output()
        autorelease_pool.clean();
 }
 
-int run_idlc(int argc, const char **argv)
+int run_idlc(int argc, char **argv)
 {
        global_argc = argc;
        global_argv = argv;
@@ -791,10 +783,11 @@ int run_idlc(int argc, const char **argv)
        return 0;
 }
 
-int main(int argc, const char **argv)
+int main(int argc, char **argv)
 {
        int ret = run_idlc(argc, argv);
        autorelease_pool.clean();
+
        return ret;
 }
 
@@ -805,7 +798,7 @@ extern "C" int yywrap()
 
 extern char *yytext;
 
-void idl_error(char *s)
+void idl_error(const char *s)
 {
        if (strlen(yytext))
                fprintf(stderr, "%s:%d: %s at \"%s\".\n", cur_input_file, curline, s, yytext);