Eliminate a couple of more all-caps variable name restrictions

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2010-02-22 08:24:29 -08:00
parent 20ca22d437
commit 88d29d2e35

View File

@ -151,7 +151,7 @@ syslog_circular_buffer() {
# #
packet_log() # $1 = number of messages packet_log() # $1 = number of messages
{ {
if [ -n "$SHOWMACS" -o $VERBOSE -gt 2 ]; then if [ -n "$g_showmacs" -o $VERBOSE -gt 2 ]; then
$LOGREAD | grep 'IN=.* OUT=.*SRC=.*\..*DST=' | head -n$1 | tac | sed 's/ kernel://; s/\[.*\] //' | sed s/" $host $LOGFORMAT"/" "/ $LOGREAD | grep 'IN=.* OUT=.*SRC=.*\..*DST=' | head -n$1 | tac | sed 's/ kernel://; s/\[.*\] //' | sed s/" $host $LOGFORMAT"/" "/
else else
$LOGREAD | grep 'IN=.* OUT=.*SRC=.*\..*DST=' | head -n$1 | tac | sed 's/ kernel://; s/MAC=.* SRC=/SRC=/; s/\[.*\] '// | sed s/" $host $LOGFORMAT"/" "/ $LOGREAD | grep 'IN=.* OUT=.*SRC=.*\..*DST=' | head -n$1 | tac | sed 's/ kernel://; s/MAC=.* SRC=/SRC=/; s/\[.*\] '// | sed s/" $host $LOGFORMAT"/" "/
@ -466,11 +466,11 @@ show_command() {
option=${option#x} option=${option#x}
;; ;;
m*) m*)
SHOWMACS=Yes g_showmacs=Yes
option=${option#m} option=${option#m}
;; ;;
f*) f*)
FILEMODE=Yes g_filemode=Yes
option=${option#f} option=${option#f}
;; ;;
t) t)
@ -588,7 +588,7 @@ show_command() {
[ $# -gt 1 ] && usage 1 [ $# -gt 1 ] && usage 1
determine_capabilities determine_capabilities
VERBOSE=2 VERBOSE=2
if [ -n "$FILEMODE" ]; then if [ -n "$g_filemode" ]; then
report_capabilities1 report_capabilities1
else else
report_capabilities report_capabilities
@ -756,7 +756,7 @@ dump_command() {
option=${option#x} option=${option#x}
;; ;;
m*) m*)
SHOWMACS=Yes g_showmacs=Yes
option=${option#m} option=${option#m}
;; ;;
l*) l*)
@ -1404,7 +1404,7 @@ logwatch_command() {
option=${option#q} option=${option#q}
;; ;;
m*) m*)
SHOWMACS=Yes g_showmacs=Yes
option=${option#m} option=${option#m}
;; ;;
-) -)