From: tho Date: Fri, 22 Feb 2008 10:18:35 +0000 (+0000) Subject: replaced tabs to spaces X-Git-Url: http://g0dil.de/git?p=senf.git;a=commitdiff_plain;h=fe593b5092295224c1f4334bcc97801d2cf41b89 replaced tabs to spaces git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@706 270642c3-0616-0410-b53a-bc976706d245 --- diff --git a/Doxyfile b/Doxyfile index 2aee5f4..c671589 100644 --- a/Doxyfile +++ b/Doxyfile @@ -8,9 +8,9 @@ GENERATE_XML = NO GENERATE_TAGFILE = doc/overview.tag TAGFILES = \ - "$(TOPDIR)/PPI/doc/PPI.tag" \ - "$(TOPDIR)/Scheduler/doc/Scheduler.tag" \ - "$(TOPDIR)/Packets/doc/Packets.tag" \ - "$(TOPDIR)/Packets/DefaultBundle/doc/DefaultBundle.tag" \ - "$(TOPDIR)/Socket/doc/Socket.tag" \ - "$(TOPDIR)/Utils/doc/Utils.tag" + "$(TOPDIR)/PPI/doc/PPI.tag" \ + "$(TOPDIR)/Scheduler/doc/Scheduler.tag" \ + "$(TOPDIR)/Packets/doc/Packets.tag" \ + "$(TOPDIR)/Packets/DefaultBundle/doc/DefaultBundle.tag" \ + "$(TOPDIR)/Socket/doc/Socket.tag" \ + "$(TOPDIR)/Utils/doc/Utils.tag" diff --git a/Examples/RateStuffer/Doxyfile b/Examples/RateStuffer/Doxyfile index 255693d..a9ffe3f 100644 --- a/Examples/RateStuffer/Doxyfile +++ b/Examples/RateStuffer/Doxyfile @@ -5,8 +5,8 @@ ALPHABETICAL_INDEX = NO EXAMPLE_PATH = . TAGFILES = \ - "$(TOPDIR)/PPI/doc/PPI.tag" \ - "$(TOPDIR)/Scheduler/doc/Scheduler.tag" \ - "$(TOPDIR)/Packets/doc/Packets.tag" \ - "$(TOPDIR)/Socket/doc/Socket.tag" \ - "$(TOPDIR)/Utils/doc/Utils.tag" + "$(TOPDIR)/PPI/doc/PPI.tag" \ + "$(TOPDIR)/Scheduler/doc/Scheduler.tag" \ + "$(TOPDIR)/Packets/doc/Packets.tag" \ + "$(TOPDIR)/Socket/doc/Socket.tag" \ + "$(TOPDIR)/Utils/doc/Utils.tag" diff --git a/Examples/Sniffer/Doxyfile b/Examples/Sniffer/Doxyfile index ff66a7c..b091ca8 100644 --- a/Examples/Sniffer/Doxyfile +++ b/Examples/Sniffer/Doxyfile @@ -4,10 +4,9 @@ PROJECT_NAME = Sniffer EXAMPLE_PATH = . TAGFILES = \ - "$(TOPDIR)/Scheduler/doc/Scheduler.tag" \ - "$(TOPDIR)/Packets/doc/Packets.tag" \ - "$(TOPDIR)/Packets/DefaultBundle/doc/DefaultBundle.tag" \ - "$(TOPDIR)/Socket/doc/Socket.tag" \ - "$(TOPDIR)/Utils/doc/Utils.tag" \ + "$(TOPDIR)/Scheduler/doc/Scheduler.tag" \ + "$(TOPDIR)/Packets/doc/Packets.tag" \ + "$(TOPDIR)/Packets/DefaultBundle/doc/DefaultBundle.tag" \ + "$(TOPDIR)/Socket/doc/Socket.tag" \ + "$(TOPDIR)/Utils/doc/Utils.tag" \ "$(TOPDIR)/doc/overview.tag" - \ No newline at end of file diff --git a/HowTos/NewPacket/Doxyfile b/HowTos/NewPacket/Doxyfile index 2db633e..ea46e15 100644 --- a/HowTos/NewPacket/Doxyfile +++ b/HowTos/NewPacket/Doxyfile @@ -4,9 +4,9 @@ PROJECT_NAME = NewPacket EXAMPLE_PATH = . TAGFILES = \ - "$(TOPDIR)/PPI/doc/PPI.tag" \ - "$(TOPDIR)/Scheduler/doc/Scheduler.tag" \ - "$(TOPDIR)/Packets/doc/Packets.tag" \ - "$(TOPDIR)/Packets/DefaultBundle/doc/DefaultBundle.tag" \ - "$(TOPDIR)/Socket/doc/Socket.tag" \ - "$(TOPDIR)/Utils/doc/Utils.tag" + "$(TOPDIR)/PPI/doc/PPI.tag" \ + "$(TOPDIR)/Scheduler/doc/Scheduler.tag" \ + "$(TOPDIR)/Packets/doc/Packets.tag" \ + "$(TOPDIR)/Packets/DefaultBundle/doc/DefaultBundle.tag" \ + "$(TOPDIR)/Socket/doc/Socket.tag" \ + "$(TOPDIR)/Utils/doc/Utils.tag" diff --git a/PPI/Doxyfile b/PPI/Doxyfile index f3257c5..276da6c 100644 --- a/PPI/Doxyfile +++ b/PPI/Doxyfile @@ -6,7 +6,7 @@ RECURSIVE = Yes SHOW_DIRECTORIES = Yes TAGFILES = \ - "$(TOPDIR)/Scheduler/doc/Scheduler.tag" \ - "$(TOPDIR)/Packets/doc/Packets.tag" \ - "$(TOPDIR)/Socket/doc/Socket.tag" \ - "$(TOPDIR)/Utils/doc/Utils.tag" + "$(TOPDIR)/Scheduler/doc/Scheduler.tag" \ + "$(TOPDIR)/Packets/doc/Packets.tag" \ + "$(TOPDIR)/Socket/doc/Socket.tag" \ + "$(TOPDIR)/Utils/doc/Utils.tag" diff --git a/Packets/DefaultBundle/Doxyfile b/Packets/DefaultBundle/Doxyfile index 49d702b..56fde27 100644 --- a/Packets/DefaultBundle/Doxyfile +++ b/Packets/DefaultBundle/Doxyfile @@ -6,7 +6,6 @@ INPUT = . ALPHABETICAL_INDEX = NO TAGFILES = \ - "$(TOPDIR)/Packets/doc/Packets.tag" \ - "$(TOPDIR)/Socket/doc/Socket.tag" \ - "$(TOPDIR)/Utils/doc/Utils.tag" - + "$(TOPDIR)/Packets/doc/Packets.tag" \ + "$(TOPDIR)/Socket/doc/Socket.tag" \ + "$(TOPDIR)/Utils/doc/Utils.tag" diff --git a/Packets/Doxyfile b/Packets/Doxyfile index 8897c7f..e6c18b9 100644 --- a/Packets/Doxyfile +++ b/Packets/Doxyfile @@ -6,5 +6,5 @@ INPUT = . EXAMPLE_PATH = . DefaultBundle TAGFILES = \ - "$(TOPDIR)/Utils/doc/Utils.tag" \ - "$(TOPDIR)/Socket/doc/Socket.tag" + "$(TOPDIR)/Utils/doc/Utils.tag" \ + "$(TOPDIR)/Socket/doc/Socket.tag" diff --git a/Packets/MPEGDVBBundle/Doxyfile b/Packets/MPEGDVBBundle/Doxyfile index e67ad83..02bc421 100644 --- a/Packets/MPEGDVBBundle/Doxyfile +++ b/Packets/MPEGDVBBundle/Doxyfile @@ -6,8 +6,8 @@ INPUT = . ALPHABETICAL_INDEX = NO TAGFILES = \ - "$(TOPDIR)/Packets/doc/Packets.tag" \ - "$(TOPDIR)/Packets/DefaultBundle/doc/DefaultBundle.tag" \ - "$(TOPDIR)/Socket/doc/Socket.tag" \ - "$(TOPDIR)/Utils/doc/Utils.tag" + "$(TOPDIR)/Packets/doc/Packets.tag" \ + "$(TOPDIR)/Packets/DefaultBundle/doc/DefaultBundle.tag" \ + "$(TOPDIR)/Socket/doc/Socket.tag" \ + "$(TOPDIR)/Utils/doc/Utils.tag" diff --git a/Scheduler/Doxyfile b/Scheduler/Doxyfile index a189e8d..bba9b50 100644 --- a/Scheduler/Doxyfile +++ b/Scheduler/Doxyfile @@ -5,5 +5,5 @@ GENERATE_TAGFILE = doc/Scheduler.tag ALPHABETICAL_INDEX = NO TAGFILES = \ - "$(TOPDIR)/Socket/doc/Socket.tag" \ - "$(TOPDIR)/Utils/doc/Utils.tag" + "$(TOPDIR)/Socket/doc/Socket.tag" \ + "$(TOPDIR)/Utils/doc/Utils.tag" diff --git a/Socket/Protocols/INet/ConnectedRawINetSocketHandle.hh b/Socket/Protocols/INet/ConnectedRawINetSocketHandle.hh index eecde8e..00c2efe 100644 --- a/Socket/Protocols/INet/ConnectedRawINetSocketHandle.hh +++ b/Socket/Protocols/INet/ConnectedRawINetSocketHandle.hh @@ -77,7 +77,7 @@ namespace senf { : public ConcreteSocketProtocol, public RawINetSocketProtocol, public BSDSocketProtocol, - public DatagramSocketProtocol, + public DatagramSocketProtocol, public AddressableBSDSocketProtocol { public: @@ -145,7 +145,7 @@ namespace senf { : public ConcreteSocketProtocol, public RawINetSocketProtocol, public BSDSocketProtocol, - public DatagramSocketProtocol, + public DatagramSocketProtocol, public AddressableBSDSocketProtocol { public: diff --git a/Socket/Protocols/INet/ConnectedUDPSocketHandle.hh b/Socket/Protocols/INet/ConnectedUDPSocketHandle.hh index f1b9106..cfc205c 100644 --- a/Socket/Protocols/INet/ConnectedUDPSocketHandle.hh +++ b/Socket/Protocols/INet/ConnectedUDPSocketHandle.hh @@ -80,7 +80,7 @@ namespace senf { : public ConcreteSocketProtocol, public UDPSocketProtocol, public BSDSocketProtocol, - public DatagramSocketProtocol, + public DatagramSocketProtocol, public AddressableBSDSocketProtocol { public: @@ -139,7 +139,7 @@ namespace senf { : public ConcreteSocketProtocol, public UDPSocketProtocol, public BSDSocketProtocol, - public DatagramSocketProtocol, + public DatagramSocketProtocol, public AddressableBSDSocketProtocol { public: diff --git a/Socket/Protocols/INet/RawINetSocketHandle.hh b/Socket/Protocols/INet/RawINetSocketHandle.hh index 363b38e..4be6a44 100644 --- a/Socket/Protocols/INet/RawINetSocketHandle.hh +++ b/Socket/Protocols/INet/RawINetSocketHandle.hh @@ -78,7 +78,7 @@ namespace senf { public RawINetSocketProtocol, public BSDSocketProtocol, public AddressableBSDSocketProtocol, - public DatagramSocketProtocol, + public DatagramSocketProtocol, public INet4MulticastSocketProtocol { public: @@ -145,7 +145,7 @@ namespace senf { public RawINetSocketProtocol, public BSDSocketProtocol, public AddressableBSDSocketProtocol, - public DatagramSocketProtocol, + public DatagramSocketProtocol, public INet6MulticastSocketProtocol { public: diff --git a/Socket/Protocols/Raw/PacketSocketHandle.hh b/Socket/Protocols/Raw/PacketSocketHandle.hh index 56aaadb..51f85c8 100644 --- a/Socket/Protocols/Raw/PacketSocketHandle.hh +++ b/Socket/Protocols/Raw/PacketSocketHandle.hh @@ -76,7 +76,7 @@ namespace senf { */ class PacketSocketProtocol : public ConcreteSocketProtocol, - public DatagramSocketProtocol, + public DatagramSocketProtocol, public BSDSocketProtocol { public: diff --git a/Utils/Logger/Doxyfile b/Utils/Logger/Doxyfile index 15f2a11..43aa66a 100644 --- a/Utils/Logger/Doxyfile +++ b/Utils/Logger/Doxyfile @@ -3,3 +3,6 @@ PROJECT_NAME = Logger GENERATE_TAGFILE = doc/Logger.tag ALPHABETICAL_INDEX = NO + +TAGFILES = \ + "$(TOPDIR)/Utils/doc/Utils.tag" \ No newline at end of file diff --git a/Utils/Logger/Target.hh b/Utils/Logger/Target.hh index cbb72c5..3d1f055 100644 --- a/Utils/Logger/Target.hh +++ b/Utils/Logger/Target.hh @@ -428,9 +428,9 @@ namespace log { virtual boost::posix_time::ptime operator()() const; }; - /** \brief Change log message time source + /** \brief Change %log message time source - Set the log message time source to \a source. The logging library will take ownership of \e + Set the %log message time source to \a source. The logging library will take ownership of \e source and will take care to free it, if necessary. Since the time source class will in almost all cases be default constructible, see the @@ -440,9 +440,9 @@ namespace log { */ void timeSource(std::auto_ptr source); - /** \brief Change log message time source + /** \brief Change %log message time source - Set the log message time source to (an instance of) \a Source. \a Source must be default + Set the %log message time source to (an instance of) \a Source. \a Source must be default constructible, otherwise use the non-template senf::log::timeSource() overload. \ingroup config diff --git a/admin/build.sh b/admin/build.sh index cd69e9b..da3706f 100755 --- a/admin/build.sh +++ b/admin/build.sh @@ -45,18 +45,18 @@ fi echo -n '# Upload started at '; date --utc rsync -rzv --del --delete-excluded \ - --filter="- .svn" \ - --filter="- linklint" \ - --filter="- debian" \ - --filter="+ */" \ - --filter="+ *.html" \ - --filter="+ *.css" \ - --filter="+ *.png" \ - --filter="+ *.php" \ - --filter="+ *.idx" \ - --filter="+ *.log" \ - --filter="- *" \ - . g0dil@shell.berlios.de://home/groups/senf/htdocs/src + --filter="- .svn" \ + --filter="- linklint" \ + --filter="- debian" \ + --filter="+ */" \ + --filter="+ *.html" \ + --filter="+ *.css" \ + --filter="+ *.png" \ + --filter="+ *.php" \ + --filter="+ *.idx" \ + --filter="+ *.log" \ + --filter="- *" \ + . g0dil@shell.berlios.de://home/groups/senf/htdocs/src echo -n '# Upload completed at '; date --utc exec >/dev/null 2>&1 diff --git a/doclib/dot b/doclib/dot index d0ccf86..d181567 100755 --- a/doclib/dot +++ b/doclib/dot @@ -6,9 +6,9 @@ sed -i -e 's/rankdir=LR/rankdir=TB/' "$1" case "$2" in -Tpng:gd) - first="$1"; shift; shift - set -- "$first" "-Tpng" "$@" - ;; + first="$1"; shift; shift + set -- "$first" "-Tpng" "$@" + ;; *) esac @@ -18,28 +18,28 @@ dot "$@" case "$4" in *.png) - if [ -r "$4" ]; then - size="`pngtopnm "$4" | sed -n -e '2p'`" - width_a="${size% *}" - height_a="${size#* }" - if [ $width_a -gt 800 ]; then - for file in "${1%.dot}".*; do - cp "$file" "$file.a" - done - sed -e 's/rankdir=LR/rankdir=TB/' -e t -e 's/rankdir=TB/rankdir=LR/' "$1.a" > "$1" - dot "$@" - size="`pngtopnm "$4" | sed -n -e '2p'`" - width_b="${size% *}" - height_b="${size#* }" - if [ $width_a -lt $width_b ]; then - for file in "${1%.dot}".*.a; do - mv "$file" "${file%.a}" - done - else - rm "${1%.dot}".*.a - fi - fi - fi - ;; + if [ -r "$4" ]; then + size="`pngtopnm "$4" | sed -n -e '2p'`" + width_a="${size% *}" + height_a="${size#* }" + if [ $width_a -gt 800 ]; then + for file in "${1%.dot}".*; do + cp "$file" "$file.a" + done + sed -e 's/rankdir=LR/rankdir=TB/' -e t -e 's/rankdir=TB/rankdir=LR/' "$1.a" > "$1" + dot "$@" + size="`pngtopnm "$4" | sed -n -e '2p'`" + width_b="${size% *}" + height_b="${size#* }" + if [ $width_a -lt $width_b ]; then + for file in "${1%.dot}".*.a; do + mv "$file" "${file%.a}" + done + else + rm "${1%.dot}".*.a + fi + fi + fi + ;; *) ;; esac diff --git a/doclib/dot-munge.pl b/doclib/dot-munge.pl index 6214e48..263b44e 100755 --- a/doclib/dot-munge.pl +++ b/doclib/dot-munge.pl @@ -20,15 +20,15 @@ if (/label=\"([^"]{48,})\"/) { #"])){ # To make ema # If at least one break is in there ... if ($label=~/\\r/) { - # If it's a pathname, make all but the last line flush left - # Otherwise only make first line flush left - if ($label=~m{/}) { - $label=~s/\\r(\\ )*/\\ \\ \\ \\ \\ \\ \\ \\ \\l/g; - # Re-add blanks before last line - $label=~s/^.*\\l/$&\\ \\ \\ \\ \\ \\ \\ \\ /; - } else { - $label=~s/\\r/\\ \\ \\ \\ \\ \\ \\ \\ \\l/; - } + # If it's a pathname, make all but the last line flush left + # Otherwise only make first line flush left + if ($label=~m{/}) { + $label=~s/\\r(\\ )*/\\ \\ \\ \\ \\ \\ \\ \\ \\l/g; + # Re-add blanks before last line + $label=~s/^.*\\l/$&\\ \\ \\ \\ \\ \\ \\ \\ /; + } else { + $label=~s/\\r/\\ \\ \\ \\ \\ \\ \\ \\ \\l/; + } # Make last line flush right $label.="\\r"; } diff --git a/doclib/filter.pl b/doclib/filter.pl index 6a022e2..14ad930 100755 --- a/doclib/filter.pl +++ b/doclib/filter.pl @@ -2,7 +2,7 @@ BEGIN { ($topdir=$0) =~ s{doclib/.*$}{}; - print $topdir,"\n"; + print $topdir,"\n"; } s/\s*$//; diff --git a/doclib/fix-links.py b/doclib/fix-links.py index 27ee4d5..2fe5db6 100644 --- a/doclib/fix-links.py +++ b/doclib/fix-links.py @@ -232,8 +232,7 @@ class LinkFixer: (opts, args) = getopt.getopt(sys.argv[1:], "vs:") if len(args) != 2: - sys.stderr.write("""Usage: - fix-links.py [-s skip-dir]... + sys.stderr.write("""Usage: fix-links.py [-s skip-dir]... Process the 'errorX.txt' and 'errorAX.txt' files as generated by 'linklint': Check all invalid links and try to find the correct diff --git a/doclib/search_functions.php b/doclib/search_functions.php index d78c6a7..9a05010 100644 --- a/doclib/search_functions.php +++ b/doclib/search_functions.php @@ -318,7 +318,7 @@ function search() $files = array(); $j=0; for ($i=0; $i" + echo " $0 [-c] " echo echo "-c Only list C/C++ source files" echo @@ -20,18 +20,17 @@ fi set -f find . \ - -name .svn -prune -o \ - -name doc -prune -o \ - -name debian -prune -o \ - -name "*.a" -o \ - -name "*.o" -o \ - -name "*~" -o \ - -name "#*#" -o \ - -name "*.pyc" -o \ - -name .test.bin -o \ - -name "*.stamp" -o \ - -name ".sconsign*" -o \ - -name "semantic.cache" -o \ - -name "all_includes.hh" -o \ + -name .svn -prune -o \ + -name doc -prune -o \ + -name debian -prune -o \ + -name "*.a" -o \ + -name "*.o" -o \ + -name "*~" -o \ + -name "#*#" -o \ + -name "*.pyc" -o \ + -name .test.bin -o \ + -name "*.stamp" -o \ + -name ".sconsign*" -o \ + -name "semantic.cache" -o \ + -name "all_includes.hh" -o \ -type f $cond \( "$@" \) - diff --git a/run-test-gdb.sh b/run-test-gdb.sh index 7fa122a..fd75fa8 100755 --- a/run-test-gdb.sh +++ b/run-test-gdb.sh @@ -67,15 +67,15 @@ gdb -batch -x .run-test-gdb.cmd ./.test.bin 2>&1 | perl -e ' if (/: fatal error in /) { print "\n"; for (@l[1..$#l]) { - last if /^#[0-9]+ +0x[0-9a-f]+ in boost::unit_test::ut_detail::invoker/; - if ($silent) { - unless (/at \/usr\/lib\/gcc\//) { - print; - $silent=0; - } - } else { - print unless /in \?\?/; - $silent=1 if /__gnu_debug::/; + last if /^#[0-9]+ +0x[0-9a-f]+ in boost::unit_test::ut_detail::invoker/; + if ($silent) { + unless (/at \/usr\/lib\/gcc\//) { + print; + $silent=0; + } + } else { + print unless /in \?\?/; + $silent=1 if /__gnu_debug::/; } } print; diff --git a/senfscons/functions.xsl b/senfscons/functions.xsl index f0c5c4d..b711cc3 100644 --- a/senfscons/functions.xsl +++ b/senfscons/functions.xsl @@ -8,7 +8,7 @@ extension-element-prefixes="str exsl func"> - +