Author: emaste
Date: Thu Oct 22 20:57:17 2009
New Revision: 198374
URL: http://svn.freebsd.org/changeset/base/198374

Log:
  Rename default to default_function, for compatibility with GNU awk.
  (For cross-compiling out-of-tree kernel modules, for example.)

Modified:
  head/sys/tools/makeobjops.awk

Modified: head/sys/tools/makeobjops.awk
==============================================================================
--- head/sys/tools/makeobjops.awk       Thu Oct 22 20:54:01 2009        
(r198373)
+++ head/sys/tools/makeobjops.awk       Thu Oct 22 20:57:17 2009        
(r198374)
@@ -240,7 +240,7 @@ function handle_method (static, doc)
                lineno++
        }
 
-       default = "";
+       default_function = "";
        if (!match(line, /\};?/)) {
                warnsrc("Premature end of file");
                error = 1;
@@ -248,9 +248,9 @@ function handle_method (static, doc)
        }
        extra = substr(line, RSTART + RLENGTH);
        if (extra ~ /[   ]*DEFAULT[     ]*[a-zA-Z_][a-zA-Z_0-9]*[       ]*;/) {
-               default = extra;
-               sub(/.*DEFAULT[  ]*/, "", default);
-               sub(/[;         ]+.*$/, "", default);
+               default_function = extra;
+               sub(/.*DEFAULT[  ]*/, "", default_function);
+               sub(/[;         ]+.*$/, "", default_function);
        }
        else if (extra && opt_d) {
                #   Warn about garbage at end of line.
@@ -294,8 +294,8 @@ function handle_method (static, doc)
 
        firstvar = varnames[1];
 
-       if (default == "")
-               default = "kobj_error_method";
+       if (default_function == "")
+               default_function = "kobj_error_method";
 
        # the method description 
        printh("/** @brief Unique descriptor for the " umname "() method */");
@@ -308,7 +308,7 @@ function handle_method (static, doc)
 
        # Print out the method desc
        printc("struct kobj_method " mname "_method_default = {");
-       printc("\t&" mname "_desc, (kobjop_t) " default);
+       printc("\t&" mname "_desc, (kobjop_t) " default_function);
        printc("};\n");
 
        printc("struct kobjop_desc " mname "_desc = {");
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to