[31196] in CVS-changelog-for-Kerberos-V5
krb5 commit: Remove line continuations in et_c.awk
daemon@ATHENA.MIT.EDU (ghudson@mit.edu)
Mon Dec 12 10:03:40 2022
From: ghudson@mit.edu
To: <cvs-krb5@mit.edu>
Message-ID: <20221212150309.E8DFE1045F9@krbdev.mit.edu>
Date: Mon, 12 Dec 2022 10:03:09 -0500 (EST)
MIME-Version: 1.0
Reply-To: krbdev@mit.edu
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/f368c75dd867965cd621d011a6770e940af4047d
commit f368c75dd867965cd621d011a6770e940af4047d
Author: gakamath <Ganesh.Kamath@amd.com>
Date: Mon Nov 28 19:56:23 2022 +0530
Remove line continuations in et_c.awk
Line continuations cause issues for the awk in MinGW, so just have
long lines instead.
[ghudson@mit.edu: rewrote commit message; factored out some string
constructions for readability]
src/util/et/et_c.awk | 13 +++++--------
src/util/et/et_h.awk | 18 ++++++------------
2 files changed, 11 insertions(+), 20 deletions(-)
diff --git a/src/util/et/et_c.awk b/src/util/et/et_c.awk
index 35d924aa3..8a86bab40 100644
--- a/src/util/et/et_c.awk
+++ b/src/util/et/et_c.awk
@@ -82,8 +82,7 @@ c2n["_"]=63
# figure out: table_number_base=table_number*256
tab_base_low = tab_base_low * 256
- tab_base_high = (tab_base_high * 256) + \
- int(tab_base_low / mod_base)
+ tab_base_high = (tab_base_high * 256) + int(tab_base_low / mod_base)
tab_base_low = tab_base_low % mod_base
if (table_number > 128*256*256) {
@@ -203,14 +202,12 @@ END {
print "#include <com_err.h>" > outfile
print "" > outfile
if (tab_base_high == 0) {
- print "const struct error_table et_" table_name "_error_table = { text, " \
- sprintf("%dL, %d };", tab_base_sign*tab_base_low, \
- table_item_count) > outfile
+ base = sprintf("%dL", tab_base_sign * tab_base_low)
} else {
- print "const struct error_table et_" table_name "_error_table = { text, " \
- sprintf("%d%06dL, %d };", tab_base_sign*tab_base_high, \
- tab_base_low, table_item_count) > outfile
+ base = sprintf("%d%06dL", tab_base_sign * tab_base_high, tab_base_low)
}
+ ints = sprintf("%s, %d", base, table_item_count)
+ print "const struct error_table et_" table_name "_error_table = { text, " ints " };" > outfile
print "" > outfile
print "#if !defined(_WIN32)" > outfile
print "void initialize_" table_name "_error_table (void)" > outfile
diff --git a/src/util/et/et_h.awk b/src/util/et/et_h.awk
index 65c6c453f..95940d1b3 100644
--- a/src/util/et/et_h.awk
+++ b/src/util/et/et_h.awk
@@ -81,8 +81,7 @@ c2n["_"]=63
# figure out: table_number_base=table_number*256
tab_base_low = tab_base_low * 256
- tab_base_high = (tab_base_high * 256) + \
- int(tab_base_low / mod_base)
+ tab_base_high = (tab_base_high * 256) + int(tab_base_low / mod_base)
tab_base_low = tab_base_low % mod_base
if (table_number > 128*256*256) {
@@ -119,11 +118,9 @@ c2n["_"]=63
/^[ \t]*(error_code|ec)[ \t]+[A-Z_0-9]+,/ {
tag=substr($2,1,length($2)-1)
if (curr_high == 0) {
- printf "#define %-40s (%dL)\n", tag, \
- curr_sign*curr_low > outfile
+ printf "#define %-40s (%dL)\n", tag, curr_sign*curr_low > outfile
} else {
- printf "#define %-40s (%d%06dL)\n", tag, curr_high*curr_sign, \
- curr_low > outfile
+ printf "#define %-40s (%d%06dL)\n", tag, curr_high*curr_sign, curr_low > outfile
}
curr_low += curr_sign;
if (curr_low >= mod_base) {
@@ -142,14 +139,11 @@ END {
exit 1
}
if (tab_base_high == 0) {
- print "#define ERROR_TABLE_BASE_" table_name " (" \
- sprintf("%d", tab_base_sign*tab_base_low) \
- "L)" > outfile
+ base = sprintf("%dL", tab_base_sign * tab_base_low)
} else {
- print "#define ERROR_TABLE_BASE_" table_name " (" \
- sprintf("%d%06d", tab_base_sign*tab_base_high, \
- tab_base_low) "L)" > outfile
+ base = sprintf("%d%06dL", tab_base_sign * tab_base_high, tab_base_low)
}
+ print "#define ERROR_TABLE_BASE_" table_name " (" base ")" > outfile
print "" > outfile
print "extern const struct error_table et_" table_name "_error_table;" > outfile
print "" > outfile
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
