svn commit: r220425 - stable/8/sys/tools
Ed Maste
emaste at FreeBSD.org
Thu Apr 7 14:17:55 UTC 2011
Author: emaste
Date: Thu Apr 7 14:17:55 2011
New Revision: 220425
URL: http://svn.freebsd.org/changeset/base/220425
Log:
MFC r198374:
Rename default to default_function, for compatibility with GNU awk.
(For cross-compiling out-of-tree kernel modules, for example.)
Modified:
stable/8/sys/tools/makeobjops.awk
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/tools/makeobjops.awk
==============================================================================
--- stable/8/sys/tools/makeobjops.awk Thu Apr 7 13:49:44 2011 (r220424)
+++ stable/8/sys/tools/makeobjops.awk Thu Apr 7 14:17:55 2011 (r220425)
@@ -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 = {");
More information about the svn-src-stable-8
mailing list