Rename logging functions

diff --git a/.zsh/logging b/.zsh/logging
index ad4c54ae52365a951d9d89dd1ac40d52e2012bc9..26d7544ccc0cd5207bee526d2abf374a907f830b 100644 (file)
--- a/.zsh/logging
+++ b/.zsh/logging
@@ -15,24 +15,24 @@ __log() {
 __do_debug() {
   [ -n "${ZDEBUG:-}" ]
 }
 __do_debug() {
   [ -n "${ZDEBUG:-}" ]
 }

-error() {
+zerror() {

   [[ -o xtrace ]] && set +x && local __XTRACE=1
   [[ -o xtrace ]] && set +x && local __XTRACE=1

-  __log E "$@" 
+  __log E "$@"

   [ "${__XTRACE:-}" ] && set -x
 }
   [ "${__XTRACE:-}" ] && set -x
 }

-warn() {
+zwarn() {

   [[ -o xtrace ]] && set +x && local __XTRACE=1
   [[ -o xtrace ]] && set +x && local __XTRACE=1

-  __log W "$@" 
+  __log W "$@"

   [ "${__XTRACE:-}" ] && set -x
 }
   [ "${__XTRACE:-}" ] && set -x
 }

-info() {
+zinfo() {

   [[ -o xtrace ]] && set +x && local __XTRACE=1
   [[ -o xtrace ]] && set +x && local __XTRACE=1

-  __log I "$@" 
+  __log I "$@"

   [ "${__XTRACE:-}" ] && set -x
 }
   [ "${__XTRACE:-}" ] && set -x
 }

-debug() {
+zdebug() {

   [[ -o xtrace ]] && set +x && local __XTRACE=1
   [[ -o xtrace ]] && set +x && local __XTRACE=1

-  __do_debug && __log D "$@" 
+  __do_debug && __log D "$@"

   [ "${__XTRACE:-}" ] && set -x
 }
 
   [ "${__XTRACE:-}" ] && set -x
 }
 

diff --git a/.zsh/sourcedir b/.zsh/sourcedir
index 40f1aa0b0acc1f402aef610810e901a355f79d5a..42269152016e3dd0b4f172ac7855b799f58b3133 100644 (file)
--- a/.zsh/sourcedir
+++ b/.zsh/sourcedir
@@ -12,15 +12,15 @@
 
 sourcedir() {
   if [ ! -d "$1" ]; then
 
 sourcedir() {
   if [ ! -d "$1" ]; then

-    error "no such directory: $1"
+    zerror "no such directory: $1"

     return 1
   fi
     return 1
   fi

-#  debug "sourcing directory ${1#$ZDOTDIR/}"
+#  zdebug "sourcing directory ${1#$ZDOTDIR/}"

   for f in "$1"/*(.N,@N); do
     case "$f" in
       *~|*.bak|*.old|*.sw?|*.zwc|*.disabled) continue;;
     esac
   for f in "$1"/*(.N,@N); do
     case "$f" in
       *~|*.bak|*.old|*.sw?|*.zwc|*.disabled) continue;;
     esac

-#    debug "  sourcing file $f"
+#    zdebug "  sourcing file $f"

     source "$f"
   done
 }
     source "$f"
   done
 }