Use proper prefixing in inigrep.sh

src/include/inigrep.sh

@@ -13,7 +13,7 @@ ffoo import pretty
 FFOO_INIGREP_SUFFIX="${FFOO_INIGREP_SUFFIX:-.ini}"
 
 
-__inigrep__cat() {
+_inigrep__cat() {
     #
     # cat without starting a process
     #
@@ -22,7 +22,7 @@ __inigrep__cat() {
 }
 
 
-__inigrep__fltcmt() {
+_inigrep__fltcmt() {
     #
     # Just strip comments
     #
@@ -30,7 +30,7 @@ __inigrep__fltcmt() {
 }
 
 
-__inigrep__fltkey() {
+_inigrep__fltkey() {
     #
     # Filter values from `key = value pairs`
     #
@@ -49,7 +49,7 @@ __inigrep__fltkey() {
 }
 
 
-__inigrep__fltsct() {
+_inigrep__fltsct() {
     #
     # Filter out only the wanted section body
     #
@@ -72,7 +72,7 @@ __inigrep__fltsct() {
 }
 
 
-__inigrep__fltlst() {
+_inigrep__fltlst() {
     #
     # Filter only section/keys/path names from the stream
     #
@@ -100,7 +100,7 @@ __inigrep__fltlst() {
 }
 
 
-__inigrep__merge() {
+_inigrep__merge() {
     #
     # Take paths and applying merge strategy, load file(s)
     #
@@ -125,11 +125,11 @@ __inigrep__merge() {
 }
 
 
-__inigrep__load() {
+_inigrep__load() {
     #
     # Find file(s) candidates and load them (or use *__merge)
     #
-    test -n "$1" || __inigrep__load "${wntsct%%.*}$FFOO_INIGREP_SUFFIX"
+    test -n "$1" || _inigrep__load "${wntsct%%.*}$FFOO_INIGREP_SUFFIX"
     local arg trydir trypath
     for arg in "$@";
     do
@@ -149,7 +149,7 @@ __inigrep__load() {
                     debug -v trypath
                     echos "$trypath"
                 done \
-              |  __inigrep__merge
+              |  _inigrep__merge
             ;;
         esac
     done
@@ -298,22 +298,22 @@ inigrep() {
         s|sections) : ;;
         *) warn "invalid object type to list: $listobj"; return 2 ;;
     esac
-    fltsct=__inigrep__cat        # section filter
-    fltkey=__inigrep__cat        # key filter
-    fltcmt=__inigrep__fltcmt     # comment filter
-    fltlst=__inigrep__cat        # listing mode filter
-    limit_line=__inigrep__cat    # limiter filter
-    test -n "$wntsct" && fltsct=__inigrep__fltsct
-    test -n "$wntkey" && fltkey=__inigrep__fltkey
-    $list && fltlst=__inigrep__fltlst
+    fltsct=_inigrep__cat        # section filter
+    fltkey=_inigrep__cat        # key filter
+    fltcmt=_inigrep__fltcmt     # comment filter
+    fltlst=_inigrep__cat        # listing mode filter
+    limit_line=_inigrep__cat    # limiter filter
+    test -n "$wntsct" && fltsct=_inigrep__fltsct
+    test -n "$wntkey" && fltkey=_inigrep__fltkey
+    $list && fltlst=_inigrep__fltlst
     $one_line && limit_line="tail -1"
     $strict && grepex=""
-    $strict && fltcmt=__inigrep__cat
+    $strict && fltcmt=_inigrep__cat
     debug -v wntkey wntsct list listobj
     debug "\$@='$@'"
     local restore_extglob=$(shopt -p extglob)
     shopt -s extglob
-    __inigrep__load "$@" \
+    _inigrep__load "$@" \
         | $fltcmt \
         | $fltsct \
         | $fltkey \