From 82a5d35360c4c882d9a5f92c4ac27c61bd4a4cc5 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 26 Apr 2021 17:28:56 +0200 Subject: -fix misc typos --- contrib/apparmor/abstractions/gnunet-common | 4 ++-- contrib/apparmor/gnunet-fs-gtk | 12 ++++++------ contrib/apparmor/gnunet-helper-dns | 4 ++-- contrib/apparmor/gnunet-service-dns | 4 ++-- contrib/conf/uncrustify_precommit | 2 +- contrib/conf/wireshark/wireshark.lua | 12 ++++++------ contrib/guix.README | 2 +- .../packages/alpine/gnunet/gnunet-gns-proxy.initd | 2 +- contrib/patches/lrn-indent.diff | 8 ++++---- contrib/scripts/check-texinfo.awk.in | 5 ----- contrib/scripts/gdb-iterate-dll.py | 2 +- contrib/scripts/gnunet-chk.py.in | 6 +++--- contrib/scripts/visualize_stats.sh | 20 +++++++++----------- contrib/vagrant/Vagrantfile | 2 +- 14 files changed, 39 insertions(+), 46 deletions(-) (limited to 'contrib') diff --git a/contrib/apparmor/abstractions/gnunet-common b/contrib/apparmor/abstractions/gnunet-common index 3bf6806f5..cb41b2bff 100644 --- a/contrib/apparmor/abstractions/gnunet-common +++ b/contrib/apparmor/abstractions/gnunet-common @@ -3,10 +3,10 @@ #GNUnet configuration file @{GNUNET_PREFIX}/share/gnunet/config.d/ r, @{GNUNET_PREFIX}/share/gnunet/config.d/*.conf r, - + /etc/gnunet.conf r, @{HOME}/.config/gnunet.conf r, owner @{GNUNET_USER}/.config/gnunet.conf r, - #GNUnet librairies + #GNUnet libraries @{GNUNET_PREFIX}/lib/libgnunet*.so.* mr, diff --git a/contrib/apparmor/gnunet-fs-gtk b/contrib/apparmor/gnunet-fs-gtk index 0ffb0b38b..cd98febf7 100644 --- a/contrib/apparmor/gnunet-fs-gtk +++ b/contrib/apparmor/gnunet-fs-gtk @@ -9,7 +9,7 @@ profile @{GNUNET_PREFIX}/bin/gnunet-fs-gtk { #include #include -# /dev/shm/LE-* rw, +# /dev/shm/LE-* rw, owner @{HOME}/.config/gtk-*/bookmarks r, owner @{HOME}/.local/share/gnunet/fs/persistence/gnunet-fs-gtk/download-child/* rw, @@ -21,8 +21,8 @@ profile @{GNUNET_PREFIX}/bin/gnunet-fs-gtk { owner @{HOME}/.local/share/gnunet/fs/persistence/gnunet-fs-gtk/publish-file/* rw, owner @{HOME}/.local/share/gnunet/fs/persistence/gnunet-fs-gtk/publish/ ra, owner @{HOME}/.local/share/gnunet/fs/persistence/gnunet-fs-gtk/publish/* rw, - - #Acces to files to share ? (lets create a gnunet directory in home) + + #Access to files to share ? (lets create a gnunet directory in home) owner @{HOME}/gnunet-fs/ r, @{GNUNET_PREFIX}/bin/gnunet-fs-gtk mr, @@ -31,13 +31,13 @@ profile @{GNUNET_PREFIX}/bin/gnunet-fs-gtk { /usr/share/glib-*/schemas/gschemas.compiled r, - #abstractions/dconf but we need write right here + #abstractions/dconf but we need write right here /run/user/*/dconf/user rw, - + @{HOME}/.cache/thumbnails/normal/*.png r, @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-fs-publish Px, - + # Site-specific additions and overrides. See local/README for details. #include } diff --git a/contrib/apparmor/gnunet-helper-dns b/contrib/apparmor/gnunet-helper-dns index b5e219585..bd5fe2f0c 100644 --- a/contrib/apparmor/gnunet-helper-dns +++ b/contrib/apparmor/gnunet-helper-dns @@ -27,7 +27,7 @@ profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-dns { /usr/bin/sysctl rix, /usr/bin/xtables-multi rix, - #Librairies + # Libraries /usr/lib/iptables/libxt_MARK.so mr, /usr/lib/iptables/libxt_owner.so mr, /usr/lib/iptables/libxt_standard.so mr, @@ -42,7 +42,7 @@ profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-dns { /usr/lib/locale/locale-archive r, @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-dns mr, - + # Site-specific additions and overrides. See local/README for details. #include } diff --git a/contrib/apparmor/gnunet-service-dns b/contrib/apparmor/gnunet-service-dns index 394b97eb1..665fd7c43 100644 --- a/contrib/apparmor/gnunet-service-dns +++ b/contrib/apparmor/gnunet-service-dns @@ -14,11 +14,11 @@ profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-dns { @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-dns mr, - #Gnunet librairies + #Gnunet libraries @{GNUNET_PREFIX}/lib/libgnunetdnsstub.so.* mr, @{GNUNET_PREFIX}/lib/libgnunetstatistics.so.* mr, @{GNUNET_PREFIX}/lib/libgnunettun.so.* mr, - + # Site-specific additions and overrides. See local/README for details. #include } diff --git a/contrib/conf/uncrustify_precommit b/contrib/conf/uncrustify_precommit index fd29998c3..24873330f 100755 --- a/contrib/conf/uncrustify_precommit +++ b/contrib/conf/uncrustify_precommit @@ -30,6 +30,6 @@ if [ $RET = 1 ]; then echo "Run" echo "uncrustify --no-backup -c uncrustify.cfg ${crustified}" - echo "before commiting." + echo "before committing." fi exit $RET diff --git a/contrib/conf/wireshark/wireshark.lua b/contrib/conf/wireshark/wireshark.lua index ac77029f6..3571a693f 100644 --- a/contrib/conf/wireshark/wireshark.lua +++ b/contrib/conf/wireshark/wireshark.lua @@ -6,7 +6,7 @@ local f = gwlan_proto.fields f.len = ProtoField.uint16 ("gnunet.len", "Gnunet Message Len") f.type = ProtoField.uint16 ("gnunet.type", "Gnunet Message Type") -- rhs_proto.fields.sequence = ProtoField.uint16("rhs.sequence","Sequence number") -f_proto = DissectorTable.new("gnunet.proto", "Gnunet Protocoll", FT_UINT16, BASE_DEC) +f_proto = DissectorTable.new("gnunet.proto", "GNUnet Protocol", FT_UINT16, BASE_DEC) --gwlan_proto.fields = {f_len, f_type} function gwlan_proto.dissector(buffer,pinfo,tree) @@ -80,8 +80,8 @@ function fragment.dissector(buffer,pinfo,tree) if buffer(10,2):uint() == 0 then if (buffer(8,2):uint() <= buffer:len() - 12) then gnunet_packet_disector(buffer(12):tvb(),pinfo,tree) - end - else + end + else subtree:add(buffer(12), "Data: " .. buffer(12)) end end @@ -92,7 +92,7 @@ hello = Proto("gnunet.hello","Gnunet Hello Message") function hello.dissector(buffer,pinfo,tree) pinfo.cols.protocol = "Gnunet Hello Message" local subtree = tree:add(hello, buffer(),"Gnunet Hello Message (" .. buffer:len() .. ")") - gnunet_message_header(buffer, pinfo, subtree) + gnunet_message_header(buffer, pinfo, subtree) if buffer:len() > (264 + 8) then subtree:add(buffer(4,4),"Reserved: " .. buffer(4,4):uint()) RsaPublicKeyBinaryEncoded(buffer(8 , 264):tvb(),pinfo, subtree) @@ -110,7 +110,7 @@ function wlan.dissector(buffer,pinfo,tree) if buffer:len() > (4 + 4 + 2*64) then subtree:add(buffer(4,4),"CRC: " .. buffer(4,4):uint()) local peer = GNUNET_PeerIdentity(buffer(8,64), pinfo, subtree) - peer:append_text(" Traget") + peer:append_text(" Target") peer = GNUNET_PeerIdentity(buffer(8 + 64,64), pinfo, subtree) peer:append_text(" Source") else @@ -118,7 +118,7 @@ function wlan.dissector(buffer,pinfo,tree) end if (buffer:len() - (4 + 4 + 2*64) > 0) then gnunet_packet_disector(buffer(4 + 4 + 2*64):tvb(),pinfo,tree) - end + end end function RsaPublicKeyBinaryEncoded(buffer,pinfo,tree) diff --git a/contrib/guix.README b/contrib/guix.README index d73b0f4aa..1e8bd3126 100644 --- a/contrib/guix.README +++ b/contrib/guix.README @@ -25,5 +25,5 @@ environment, run: guix environment --load-path=/contrib/guix.scm --ad-hoc guix -It is recommented to also pass the '--pure' option to guix, to make +It is recommended to also pass the '--pure' option to guix, to make sure the environment is not polluted with existing packages. diff --git a/contrib/packages/alpine/gnunet/gnunet-gns-proxy.initd b/contrib/packages/alpine/gnunet/gnunet-gns-proxy.initd index 2a4dcc1c4..ac5db666c 100644 --- a/contrib/packages/alpine/gnunet/gnunet-gns-proxy.initd +++ b/contrib/packages/alpine/gnunet/gnunet-gns-proxy.initd @@ -13,7 +13,7 @@ depend() { } start() { - # Enable GNS proxy for existant users. + # Enable GNS proxy for existing users. for user in $users; do # Create/Renew GNS certificate authority (CA) per user. su $user -c "gnunet-gns-proxy-setup-ca" diff --git a/contrib/patches/lrn-indent.diff b/contrib/patches/lrn-indent.diff index 8ba3b77cc..2cf61d2cf 100644 --- a/contrib/patches/lrn-indent.diff +++ b/contrib/patches/lrn-indent.diff @@ -40,13 +40,13 @@ diff -u indent-2.2.11/src/handletoken.c indent-2.2.11.my/src/handletoken.c + parser_state_tos->in_parameter_declaration = 0; + } } - + /** diff -u indent-2.2.11/src/indent.h indent-2.2.11.my/src/indent.h --- indent-2.2.11/src/indent.h 2009-10-11 23:15:34 +0400 +++ indent-2.2.11.my/src/indent.h 2011-08-16 14:19:37 +0400 @@ -318,6 +318,11 @@ - int brace_indent; /*!< number of spaces to indent braces from the suround if, while, etc. in -bl + int brace_indent; /*!< number of spaces to indent braces from the surround if, while, etc. in -bl * (bype_2 == 0) code */ int expect_output_file; /*!< Means "-o" was specified. */ + int diff_decls_and_defs; /*!< Makes indent think that function prototypes are terminated by ';', @@ -55,7 +55,7 @@ diff -u indent-2.2.11/src/indent.h indent-2.2.11.my/src/indent.h + * This is the default. + */ } user_options_ty; - + extern user_options_ty settings; @@ -430,6 +435,7 @@ * slightly different */ @@ -71,7 +71,7 @@ diff -u indent-2.2.11/src/lexi.c indent-2.2.11.my/src/lexi.c @@ -616,8 +616,11 @@ * I've added '=' to this list to keep from breaking * a non-valid C macro from libc. -jla */ - + - if (*tp != ';' && *tp != ',' && *tp != '(' && *tp != '=') + if ((*tp != ';' || !settings.diff_decls_and_defs) && + *tp != ',' && *tp != '(' && *tp != '=') diff --git a/contrib/scripts/check-texinfo.awk.in b/contrib/scripts/check-texinfo.awk.in index 3d6a1c643..4efa73658 100755 --- a/contrib/scripts/check-texinfo.awk.in +++ b/contrib/scripts/check-texinfo.awk.in @@ -52,11 +52,6 @@ BEGIN { } { - if (/wether/) { - printf "...lines containing a popular typo\n" ; - print FILENAME":"NR":"$0 ; - } - if (/the the/) { printf "...lines containing a popular typo\n" ; print FILENAME":"NR":"$0 ; diff --git a/contrib/scripts/gdb-iterate-dll.py b/contrib/scripts/gdb-iterate-dll.py index 28c435ccb..882dee039 100644 --- a/contrib/scripts/gdb-iterate-dll.py +++ b/contrib/scripts/gdb-iterate-dll.py @@ -7,7 +7,7 @@ def search_dll(head, field, match, pfield): head: name of the symbol denoting the head of the DLL field: the field that should be search for match - match: the mathing value for field + match: the matching value for field pfield: the field whose value is to be printed for matched elements; None to print all fields of the matched elemented """ diff --git a/contrib/scripts/gnunet-chk.py.in b/contrib/scripts/gnunet-chk.py.in index afc0924f4..74e9e4cf9 100755 --- a/contrib/scripts/gnunet-chk.py.in +++ b/contrib/scripts/gnunet-chk.py.in @@ -32,7 +32,7 @@ from functools import reduce # Defaults DBLOCK_SIZE = (32 * 1024) # Data block size -# Pick a multiple of 2 here to achive 8-byte alignment! We also +# Pick a multiple of 2 here to achieve 8-byte alignment! We also # probably want DBlocks to have (roughly) the same size as IBlocks. # With SHA-512, the optimal value is 32768 byte / 128 byte = 256 (128 # byte = 2 * 512 bits). DO NOT CHANGE! @@ -288,7 +288,7 @@ def compute_rootchk(readin, size): current_depth = 0 chks = [None] * (depth * CHK_PER_INODE) # list buffer read_offset = 0 - logging.debug("Begining to calculate tree hash with depth: " + repr(depth)) + logging.debug("Beginning to calculate tree hash with depth: " + repr(depth)) while True: if (depth == current_depth): off = CHK_PER_INODE * (depth - 1) @@ -370,7 +370,7 @@ if '__main__' == __name__: opts, args = getopt.getopt(sys.argv[1:], "h", ["help"]) except getopt.GetoptError as err: print(err) - print("Exception occured") + print("Exception occurred") usage() sys.exit(2) for option, value in opts: diff --git a/contrib/scripts/visualize_stats.sh b/contrib/scripts/visualize_stats.sh index aaa5e657b..b3404b164 100755 --- a/contrib/scripts/visualize_stats.sh +++ b/contrib/scripts/visualize_stats.sh @@ -1,7 +1,7 @@ #!/bin/bash # -# This script polls gnunet-stats repeatedly to create statistics plots. -# Use 'collect' to collect statistics and 'plot' to plot whats been +# This script polls gnunet-stats repeatedly to create statistics plots. +# Use 'collect' to collect statistics and 'plot' to plot what has been # collected. All plots will be written to $STATDIR as separate .png files. # # WARNING: calling 'collect' will delete all files in $STATDIR. @@ -10,7 +10,7 @@ # # Note: gnuplot syntax has changed across versions. This # script perhaps will not produce color images with older gnuplots. -# The script should work atleast with gnuplot 3.8k patchlevel 1. +# The script should work at least with gnuplot 3.8k patchlevel 1. # SLEEP=120 @@ -26,10 +26,10 @@ mkdir -p $STATDIR case "$1" in collect) rm -f $STATDIR/* - + STARTTIME=`date +%s` IFS=":" - + while true; do NOW=`date +%s` RELAT=$[$NOW-$STARTTIME] @@ -45,7 +45,7 @@ case "$1" in # Write new stats echo $RELAT $VALUE >>"$STATDIR/$KEY.dat" echo $RELAT $PREV $VALUE >>"$STATDIR/$KEY.diff" - + done sleep $SLEEP done @@ -61,13 +61,13 @@ case "$1" in rm "$FILENAME.png" fi done - + # Plot diff ls -1 $STATDIR/*.diff | while read FILENAME; do BASENAME=`basename "$FILENAME" | sed -e "s/ *\..*//g"` echo "set terminal png;set output '$FILENAME.png';set title '$BASENAME - diff';plot '$FILENAME' using (\$1/60):(\$3-\$2) title '' with lines;" | nice gnuplot 2> $TMP EC=`cat $TMP | grep "empty" | grep "Warning" | wc -l` - if test $EC -ge 1 + if test $EC -ge 1 then rm "$FILENAME.png" fi @@ -80,7 +80,5 @@ case "$1" in *) echo $"Usage: $0 {collect|plot|view}" exit 1 - -esac - +esac diff --git a/contrib/vagrant/Vagrantfile b/contrib/vagrant/Vagrantfile index d6b671b24..de7f07ed5 100644 --- a/contrib/vagrant/Vagrantfile +++ b/contrib/vagrant/Vagrantfile @@ -34,7 +34,7 @@ Vagrant.configure(2) do |config| config.cache.scope = :box end - # use http proxy if avaiable + # use http proxy if available if ENV['http_proxy'] && Vagrant.has_plugin?("vagrant-proxyconf") config.proxy.http = "$http_proxy" config.proxy.https = "$https_proxy" -- cgit v1.2.3