Packman Build Service PMBS

gtk-gnutella.changes Changed

gtk-gnutella.spec Changed

gtk-gnutella-remove_DATE_from_entropy.patch Changed

gtk-gnutella-0.97.tar.bz2/ChangeLog -> gtk-gnutella-0.97.1.tar.bz2/ChangeLog Changed

@@ -1,3 +1,39 @@
+# v 0.97.1   2011-09-11  stable
+
+This is a bug-fixing release, addressing critical bugs that slipped through
+in the 0.97 release but which happen only in particular conditions.
+
+The project also switched from SVN to git.  This affects the version number
+which no longer includes a single SVN revision but instead uses the combination
+of a counter for the number of changes since the last release plus git's
+abbreviated commit ID.
+
+Bug Fixes:
+- Fixed bootstrapping problems on IPv6 enabled hosts bug #3376322.
+- Forgot to clear global HTTP handle on GHC errors bug #376322.
+- Typo caused crash when processing alternate locations in firewalled mode
+  with PFSP enabled.
+- Forgot to clear pending THEX downloads on download stops.
+- Make sure we remove the SHA1 of de-indexed files from the shared set.
+- Handle "message too large" errors when sending on UDP.
+
+Under the Hood:
+- When running as ultra node, use GUESS introduction pings when requesting
+  a query key so that the remote ultrapeer can passively discover us.
+- Do not count GUID collisions with our own GUID when we see our own IP:port!
+- Added some gcc 4.6 "hot" / "cold" routine tagging for better optimizations.
+- netmask_to_cidr(): was not using the proper metaconfig symbol to activate
+  the usage of __builtin_popcount.
+- Updated build.sh to build an app bundle for OSX with target=osxbundle
+- Added "dmg" to the default extension list for shared files.
+- Added OS X integration support: menu bar is now on the OS menubar on top,
+  the application does a clean exit on cmd-q and the application continues
+  to run when only the window is closed.
+- Use the downloads folder on Windows 7 and Vista for completed downloads.
+- Updated the geographic IP mapping database.
+- Integrated spell check of the French translation from stegozor@gmail.com.
+- Turned "zalloc_always_gc" to FALSE by default.
+
 # v 0.97     2011-07-18  stable
 
 This is a major release, fixing critical long-standing bugs and introducing

gtk-gnutella-0.97.tar.bz2/Configure -> gtk-gnutella-0.97.1.tar.bz2/Configure Changed

gtk-gnutella-0.97.tar.bz2/Jmakefile -> gtk-gnutella-0.97.1.tar.bz2/Jmakefile Changed

gtk-gnutella-0.97.tar.bz2/MANIFEST -> gtk-gnutella-0.97.1.tar.bz2/MANIFEST Changed

@@ -56,6 +56,7 @@
 doc/gnutella/GUESS
 doc/gnutella/HSEP
 doc/gnutella/IPv6
+doc/gnutella/IPv6-Ready
 doc/gnutella/PARQ
 doc/gnutella/PFSP
 doc/gnutella/QRP
@@ -139,8 +140,11 @@
 extra_files/en/Makefile.SH
 extra_files/favicon.png      GTKG's favorite web icon
 extra_files/geo-ip.txt
+extra_files/gtk-gnutella.128.png
 extra_files/gtk-gnutella.16.png
+extra_files/gtk-gnutella.256.png
 extra_files/gtk-gnutella.32.png
+extra_files/gtk-gnutella.512.png
 extra_files/gtk-gnutella.desktop
 extra_files/gtk-gnutella.png
 extra_files/gtk-gnutella.svg
@@ -149,6 +153,10 @@
 extra_files/ja/Jmakefile
 extra_files/ja/Makefile.SH
 extra_files/magnet.svg
+osx/Info-gtk-gnutella.plist
+osx/gtk-gnutella.bundle
+osx/gtk-gnutella.icns
+osx/launcher.sh
 extra_files/robots.txt       Default hints for web crawlers
 extra_files/spam.txt
 extra_files/spam_sha1.txt
@@ -231,6 +239,7 @@
 scripts/fix_copyright.pl
 scripts/generic-cat
 scripts/geo-to-db.pl
+scripts/git-version.sh
 scripts/gtkg-dbus-listener.py
 scripts/gtkg-version
 scripts/magnet-handler.sh
@@ -769,8 +778,6 @@
 src/lib/zlib_util.c
 src/lib/zlib_util.h
 src/main.c
-src/revision.h
-src/revision_h.SH
 src/sdbm/CHANGES
 src/sdbm/Jmakefile
 src/sdbm/Makefile.SH

gtk-gnutella-0.97.tar.bz2/README -> gtk-gnutella-0.97.1.tar.bz2/README Changed

@@ -130,7 +130,7 @@
     ./build.sh --topless
 
 The option "official" should be set to "true" unless you want to test
-gtk-gnutella from SVN or are a developer. Currently, an "inofficial" build
+gtk-gnutella from git or are a developer. Currently, an "inofficial" build
 will access files in the sources directory to ease the process of testing.
 However, the meaning of this option might change at any time.  Therefore,
 software distributions and admins are urged to provide "official" builds
@@ -290,8 +290,8 @@
 might want to read some of the past messages in the archives and see what we 
 have been up to lately.
 
-If you want contribute code, please follow the style guide in the SVN version:
-gtk-gnutella-current/doc/devguide/STYLE
+If you want contribute code, please follow the style guide, as described in
+the doc/devguide/STYLE file.
 
 Read the "Development" and "Developers Howto" pages on the gtk-gnutella home 
 page. 
@@ -302,15 +302,14 @@
 up a patch file, although you can attach files. You should let everyone on the 
 mail list know that you posted a patch to the patch tracker.
 
-If you find bugs, please use the bug tracker on sourceforge (or fix them!).  
-Once you get a copy from SVN (see the SVN page for instructions), and you 
-make some modifications, from a shell make sure you cd into the 
-"gtk-gnutella-current" directory, type "svn diff > output-diff.txt" and a 
-patch file will be created, referencing the current SVN version.  You can then 
-upload this file so others can patch their version with your changes. We use 
-the "unified" format for patches, thus the "-u".  If your patch requires other 
-patches, you should include them also.  Before starting a big project, you may 
-want to ask the list if anyone else is working on that fix so you don't 
-duplicate work.
+If you find bugs, please use the bug tracker on sourceforge (or fix
+them!).  Once you get a copy from git (see the git page for instructions),
+and you make some modifications, from a shell make sure you cd into the
+"gtk-gnutella" directory, type "git diff > output-diff.txt" and a patch
+file will be created, referencing the current git version.  You can then
+upload this file so others can patch their version with your changes.
+If your patch requires other patches, you should include them also.
+Before starting a big project, you may want to ask the list if anyone
+else is working on that fix so you don't duplicate work.
 
 /* vi: set et ts=4: */

gtk-gnutella-0.97.tar.bz2/README.Debian -> gtk-gnutella-0.97.1.tar.bz2/README.Debian Changed

gtk-gnutella-0.97.tar.bz2/README.xmingw -> gtk-gnutella-0.97.1.tar.bz2/README.xmingw Changed

gtk-gnutella-0.97.tar.bz2/U/modified/End.U -> gtk-gnutella-0.97.1.tar.bz2/U/modified/End.U Changed

gtk-gnutella-0.97.tar.bz2/U/modified/Myinit.U -> gtk-gnutella-0.97.1.tar.bz2/U/modified/Myinit.U Changed

gtk-gnutella-0.97.tar.bz2/U/modified/prototype.U -> gtk-gnutella-0.97.1.tar.bz2/U/modified/prototype.U Changed

gtk-gnutella-0.97.tar.bz2/U/packages/dbusconfig.U -> gtk-gnutella-0.97.1.tar.bz2/U/packages/dbusconfig.U Changed

gtk-gnutella-0.97.tar.bz2/U/packages/glade.U -> gtk-gnutella-0.97.1.tar.bz2/U/packages/glade.U Changed

gtk-gnutella-0.97.tar.bz2/U/packages/glibconfig.U -> gtk-gnutella-0.97.1.tar.bz2/U/packages/glibconfig.U Changed

gtk-gnutella-0.97.tar.bz2/U/packages/glibversion.U -> gtk-gnutella-0.97.1.tar.bz2/U/packages/glibversion.U Changed

gtk-gnutella-0.97.tar.bz2/U/packages/gnutlsconfig.U -> gtk-gnutella-0.97.1.tar.bz2/U/packages/gnutlsconfig.U Changed

gtk-gnutella-0.97.tar.bz2/U/packages/gtkconfig.U -> gtk-gnutella-0.97.1.tar.bz2/U/packages/gtkconfig.U Changed

gtk-gnutella-0.97.tar.bz2/U/packages/gtkversion.U -> gtk-gnutella-0.97.1.tar.bz2/U/packages/gtkversion.U Changed

gtk-gnutella-0.97.tar.bz2/U/packages/remotectrl.U -> gtk-gnutella-0.97.1.tar.bz2/U/packages/remotectrl.U Changed

gtk-gnutella-0.97.tar.bz2/U/packages/xmlconfig.U -> gtk-gnutella-0.97.1.tar.bz2/U/packages/xmlconfig.U Changed

gtk-gnutella-0.97.tar.bz2/U/specific/gtkgversion.U -> gtk-gnutella-0.97.1.tar.bz2/U/specific/gtkgversion.U Changed

gtk-gnutella-0.97.tar.bz2/build.sh -> gtk-gnutella-0.97.1.tar.bz2/build.sh Changed

@@ -44,6 +44,7 @@
 build_ui=
 build_verbose='-s'
 build_xmingw='false'
+build_osxbundle='false'
 build_xtarget=
 
 # There is something broken about Configure, so it needs to know the
@@ -53,6 +54,16 @@
 darwin|Darwin)
     build_so_suffix='dylib'
     ;;
+osxbundle)
+	build_so_suffix='dylib'
+	build_osxbundle='true'
+	CPPFLAGS="$CPPFLAGS -DHAVE_GTKOSXAPPLICATION"
+	CPPFLAG="${CPPFLAGS# *}"    # strip leading spaces
+	LIBS="$LIBS -ligemacintegration -liconv -lz"
+	LIBS="${LIBS# *}"           # strip leading spaces
+	PREFIX=`dirname ${PWD}/$0`/osx/bundle
+	echo $PREFIX
+	;;
 MINGW*)
     # FIXME: The MingW installation prefix is hardcoded (as default) for now,
     # This could be detected maybe. On Ubuntu and Debian it is
@@ -193,6 +204,12 @@
 ${MAKE} clobber >/dev/null 2>&1 || : ignore failure
 rm -f config.sh
 
+if  "X$build_osxbundle" = Xtrue 
+then
+	build_ui='gtkversion=2'
+	echo $build_ui
+fi
+
 # Use /bin/sh explicitely so that it works on noexec mounted file systems.
 # Note: Configure won't work as of yet on such a file system.
 if  "X$build_xmingw" = Xtrue 
@@ -267,7 +284,20 @@
 ${MAKE} depend || { echo; echo 'ERROR: make depend failed.'; exit 1; }
 ${MAKE} || { echo; echo 'ERROR: Compiling failed.'; exit 1; }
 
+if  "X$build_osxbundle" = Xtrue 
+then
+	rm -rf osx/bundle
+	make install &&
+	ige-mac-bundler osx/gtk-gnutella.bundle &&
+	rm -rf osx/bundle &&
+	ln -s /Applications osx/image/Applications &&
+	dmg="${HOME}/Desktop/Gtk-Gnutella-`./scripts/git-version.sh`.dmg" &&
+	hdiutil create -srcfolder osx/image -volname Gtk-Gnutella "${dmg}" &&
+	hdiutil internet-enable -yes "${dmg}"
+	rm -rf osx/image
+else
 echo "Run \"${MAKE} install\" to install gtk-gnutella."
+fi
 exit
 
 # vi: set ts=4 sw=4 et:

gtk-gnutella-0.97.tar.bz2/config_h.SH -> gtk-gnutella-0.97.1.tar.bz2/config_h.SH Changed

gtk-gnutella-0.97.tar.bz2/debian/changelog -> gtk-gnutella-0.97.1.tar.bz2/debian/changelog Changed

gtk-gnutella-0.97.tar.bz2/doc/devguide/DEBUGGING -> gtk-gnutella-0.97.1.tar.bz2/doc/devguide/DEBUGGING Changed

gtk-gnutella-0.97.tar.bz2/doc/devguide/GUI-hacking -> gtk-gnutella-0.97.1.tar.bz2/doc/devguide/GUI-hacking Changed

gtk-gnutella-0.97.tar.bz2/doc/devguide/HOMEPAGE -> gtk-gnutella-0.97.1.tar.bz2/doc/devguide/HOMEPAGE Changed

gtk-gnutella-0.97.tar.bz2/doc/devguide/I18N -> gtk-gnutella-0.97.1.tar.bz2/doc/devguide/I18N Changed

gtk-gnutella-0.97.tar.bz2/doc/devguide/RELEASE -> gtk-gnutella-0.97.1.tar.bz2/doc/devguide/RELEASE Changed

@@ -23,7 +23,7 @@
    local files:
 
 	cd "top directory"
-	svn update
+	git pull --rebase origin
 	cd extra_files
 	make update			# updates geo-ip.txt
 
@@ -62,25 +62,26 @@
 
 7. From the "top directory", run:
 
-	svn diff > ~/tmp/xxx
+	git diff > ~/tmp/xxx
 
    Look at the ~/tmp/xxx file to see whether there are still uncommitted
    changes that require to be checked-in before the release is made.
    Commit them if needed.
 
-8. Tag whole SVN:
+8. Tag project with a PGP signature:
 
 	cd "top directory"
-	svn copy \
-	  https://gtk-gnutella.svn.sourceforge.net/svnroot/gtk-gnutella/trunk \
-	  https://gtk-gnutella.svn.sourceforge.net/svnroot/gtk-gnutella/tags/V-0-91
+	git tag -s v0.97.1
 
 9. Make a clean distribution package:
 
 	cd "top directory"
-	makedist -q -c gtk-gnutella-0.92.1
+	makedist -q -c gtk-gnutella-0.97.1
+	cd gtk-gnutella-0.97.1
+	./scripts/git-version.sh >version
 
-   This will generate a directory gtk-gnutella-0.92.1
+   This will generate a directory gtk-gnutella-0.97.1 and include the
+   proper version file.
 
 10. Create the tar.bz2 and detached ASCII signature

gtk-gnutella-0.97.tar.bz2/doc/devguide/STYLE -> gtk-gnutella-0.97.1.tar.bz2/doc/devguide/STYLE Changed

gtk-gnutella-0.97.1.tar.bz2/doc/gnutella/IPv6-Ready Added

@@ -0,0 +1,383 @@
+                  Making Gnutella "IPv6-Ready"
+
+                        Raphael Manfredi
+                  <Raphael_Manfredi@pobox.com>
+
+                        June 22nd, 2011
+
+
+1. Introduction
+
+Now that IPv4 address exhaustion is a fact, there is going to be a
+huge incentive to accelerate IPv6 deployment.  People equipped with
+an IPv4 address are going to be supplied an IPv6 address (actually a
+network prefix where they can host several thousands of machines, if
+not millions) whilst others are going to only have IPv6, without any
+IPv4 address at all.
+
+The Gnutella protocol needs to evolve slightly to make it possible
+to run on IPv6 because it architected some of its core fields holding
+IP addresses as being 4-byte long, i.e. only capable of storing IPv4
+addresses.
+
+However, IPv6 is a totally new network protocol, distinct from IPv4.
+Although there are some mechanisms in IPv6 to be able to reach IPv4
+addresses, the necessary translation mechanisms may not be available
+everywhere.  This means Gnutella on IPv6 is going to form a network
+overlay completely distinct than the current Gnutella network, which
+is IPv4-based.
+
+Fortunately, the fact that many people are going to be given an IPv6
+address in addition to a legacy IPv4 one is an opportunity to bootstrap
+the IPv6 network nicely, until there are sufficient IPv6 peers to create
+a stable Gnutella core.
+
+This article only focuses on the Gnutella network protocol changes
+that must be incorporated into all Gnutella servents to make them
+"IPv6-Ready", that is capable of being a part of the IPv6-only Gnutella
+network tomorrow.  Servents that are not IPv6-Ready are condemned to stick
+to the IPv4 network, which will be slowly dying first, until a critical
+point is reached at which time the stable IPv4 core will disappear,
+replaced by the IPv6 core.
+
+These IPv6-Ready Specifications are meant to be totally backward
+compatible, so that legacy servents see almost no difference and can
+still usefully interact with modern IPv6-Ready servents.
+
+
+2. Gnutella Messages
+
+This section introduces new GGEP extensions to be used in various Gnutella
+messages to be able to transport IPv6 addresses.
+
+
+2.1 Legacy Messages
+
+The following Gnutella messages have been historically architected to
+hold IPv4 addresses only: Pong, Query Hit, Push.
+
+To expand them so that they can hold an additional IPv6 address or simply
+a single IPv6 one, one strategic GGEP extension is introduced:
+
+The "6" extension holds a full IPv6 address, in raw binary big-endian
+format, that is 16 bytes.  Its presence in Pong, Push or Query Hit
+trailer indicates that the servent is running both on IPv6.
+
+The regular IPv4 field is filled normally if the servent also runs on IPv4,
+and is set to 127.0.0.0 if the servent does not have a valid IPv4 address.
+
+This design has the following properties:
+
+- It clearly communicates the level of IPv6 support: IPv4 only (no "6"
+  present), IPv4 and IPv6 support ("6" present, valid IPv4), IPv6 only
+  ("6" present and IPv4 is 127.0.0.0).
+
+- When parsed by a non IPv6-Ready servent, the IPv4 field will be
+  meaningful most of the time.  Interpreting the IPv4 address present
+  in the packet cannot harm anyone, should it be 127.0.0.0.
+
+
+2.2 Extended Messages
+
+Over time, some legacy messages have been extended with GGEP extensions
+to transport packed IPv4:port tuples.  These are the "IPP", "ALT",
+"PUSH" extensions found in pongs or in query hits, forming vectors of
+6-byte items.
+
+All the legacy extensions are kept but new ones are introduced
+specifically for transporting packed IPv6:port tuples, the IPv6 address
+being in big-endian and the port in little-endian, to form a vector of
+18-byte items.
+
+The "ALT6" and "ALT6_TLS" extensions are introduced for query hits:
+"ALT6" packs IPv6:port alternate locations and "ALT6_TLS" is like
+"ALT_TLS" but applies to the "ALT6" vector, indicating which of the
+alternate location hosts are known to support TLS.
+
+Likewise, the "IPP6" and "IPP6_TLS" extensions are introduced for UHC
+pongs, "PUSH6" and "PUSH6_TLS" for query hits push-proxies.
+
+The "IP" extension in Pongs (used to send back the IP:port of the remote
+host) is extended to be able to hold IPv4:port or IPv6:port, as needed.
+The size of the extension payload (6 or 18 bytes) will discriminate
+between the two forms.
+
+
+2.3 OOB Queries
+
+Queries requesting Out Of Band hit delivery encode the IPv4 address of
+the recipient in the GUID.
+
+Queries requiring that delivery by sent back to an IPv6 address must
+make sure to encode 127.0.0.0 as the IPv4 address in the GUID,
+supplying the IPv6 address in a GGEP "6" extension.
+
+Because there is no guarantee that the servent reporting hits will support
+IPv6, the "6" extension should only be used when there is no other choice,
+i.e. when the querying party only has access to IPv6.
+
+Well-written legacy servents should also gracefully handle the 127.0.0.0
+case by recognizing that this is a non-routable address and therefore the
+OOB flag in the query should be ignored and the query hit routed back
+through Gnutella.
+
+
+2.4 Vendor Messages
+
+2.4.1 HEAD Ping and HEAD Pong (LIME/23 and LIME/24)
+
+GGEP "A6" and "T6" are introduced for HEAD pongs (v2) to transport IPv6
+alt locations and TLS indication (mirroring "A" and "T").  Since HEAD
+pongs (v1) cannot be made IPv6-Ready, servents should obsolete HEAD
+ping (v1) requests and only send v2 ones (LIME/23v2 vendor messages aka
+"HEAD Ping", answered to by LIME/24v2 aka "HEAD Pong").
+
+
+2.4.2 Connect Back
+
+There is no need to change the connect back messages (BEAR/7 and GTKG/7):
+they connect back to the originating address as communicated by the TCP
+or UDP layer, be it on top of IPv4 or IPv6.
+
+
+2.4.3 OOB Reply Indication (LIME/12)
+
+There is no need to change anything in the message: the sender knows to
+which address send the message, and the recipient will request results
+by contacting the address given by UDP, be it UDP/IPv6 or UDP/IPv4.
+
+
+2.4.4 UDP Crawler Ping (LIME/5)
+
+There is no provision in the LIME/5v1 to request IPv6 addresses, nor is
+there any provision in the UDP Crawler Pong (LIME/6v1) to include them.
+
+These messages therefore need to be extended as v2, using the "features"
+byte to include a flag requesting IPv6.  A new format will need to be
+used for the reply Pong, probably using GGEP keys instead ("U" and "U6"
+keys for ultras, "L" and "L6" for leaves, for instance). To be specified
+in another document
+
+The v1 message will only report IPv4 peers.
+
+
+3. Header Extensions
+
+All the Gnutella and HTTP headers that can propagate hosts in the form
+of IP:port must be extended to allow inclusion of IPv6 addresses as well.
+
+When emitting an ASCII representation for IPv6:port, the IPv6 address
+MUST be included between brackets, such as:
+
+	2001:3d4:12aa:200::5:5400
+
+The impacted headers are: X-Alt, X-Nalt, X-Falt, X-Push-Proxies,
+X-FW-Node-Info and X-Try-Ultrapeers.
+
+These headers can freely mix IPv4 and IPv6 addresses, as needed.
+For instance:
+
+	X-Push-Proxies: 2001:3d4:12aa:200::5:5400, 5.6.7.8:4600
+
+In X-FW-Node-Info, the local host information is given as port:IP, and
+this can also be an IPv6 address, which must be included within brackets
+since it is given with a port number:
+
+	X-FW-Node-Info: 8ac8d3b457788a906f599b268698b200;fwt/1;
+		5400:2001:3d4:12aa:200::5
+
+All IPv6-Ready servents must be able to parse these IPv6 addresses, but
+do not necessarily need to use them.  However, as will be described in
+section 5, there is a mechanism to negotiate the level of IPv6 support
+so that servents unaware of these specification are not impacted.
+
+
+4. Network Connection
+
+It is essential that servents equipped with both and IPv4 and an IPv6
+address be listening on the two networks.  Their "primary" IP address
+advertised in query hits, pongs, etc... will be the IPv4 one, but they can

gtk-gnutella-0.97.tar.bz2/doc/gnutella/msg/GTKG.lst -> gtk-gnutella-0.97.1.tar.bz2/doc/gnutella/msg/GTKG.lst Changed

gtk-gnutella-0.97.tar.bz2/doc/manual/manual.xml -> gtk-gnutella-0.97.1.tar.bz2/doc/manual/manual.xml Changed

gtk-gnutella-0.97.tar.bz2/doc/other/dbus-support.txt -> gtk-gnutella-0.97.1.tar.bz2/doc/other/dbus-support.txt Changed

gtk-gnutella-0.97.tar.bz2/doc/other/shell.txt -> gtk-gnutella-0.97.1.tar.bz2/doc/other/shell.txt Changed

gtk-gnutella-0.97.tar.bz2/doc/public/GGEP/ALT -> gtk-gnutella-0.97.1.tar.bz2/doc/public/GGEP/ALT Changed

gtk-gnutella-0.97.tar.bz2/doc/public/GGEP/GTKG-V -> gtk-gnutella-0.97.1.tar.bz2/doc/public/GGEP/GTKG-V Changed

@@ -1,5 +1,5 @@
 The 'GTKGV' GGEP Extension
-======================
+==========================
 
 Name: GTKGV
 Version: 0
@@ -15,14 +15,84 @@
 
 The payload format is (BE stands for Big-Endian):
 
-    <ver>			1 byte		extension version (0)
-    <major>			1 byte		major release
-    <minor>			1 byte		minor release
-    <patchlevel>	1 byte		patch-level
-    <lettercode>	1 byte		'u', 'b', or '\0' if none
-    <release time>	4 bytes BE	UNIX timestamp of release date (GMT)
-    <build>			4 bytes	BE	build number
+    <ver>           1 byte      extension version (0)
+    <major>         1 byte      major release
+    <minor>         1 byte      minor release
+    <patchlevel>    1 byte      patch-level
+    <lettercode>    1 byte      'u', 'b', or '\0' if none
+    <release time>  4 bytes BE  UNIX timestamp of release date (GMT)
+    <build>         4 bytes BE  build number
 
 Total payload size: 13 bytes
 
 The payload is never deflated nor COBS-encoded.
+
+--------------------------
+
+Name: GTKGV
+Version: 1
+Status: Production
+Date: Tue Sep  6 23:28:56 CEST 2011
+Format: regular GTKGV v0 payload <flags> variable
+COBS-Encoding: Never
+Deflate: Never
+
+This extension is backward compatible with version 0 with the following
+additions / changes:
+
+* The first byte <ver> is the number 1.
+* The following fields are added:
+
+    <flags>         variable      flags (see below)
+
+The first byte of the <flags> are architected thusly:
+
+    bit 0           indicates git's commit identifier present
+    bit 1           "dirty", signals uncommitted local changes at build time
+    bit 2           indicates OS code present
+    bit 3 to 6      RESERVED
+    bit 7           if set, indicates an additional <flags> byte
+
+The 7th bit of the flags is a "continuation" flag.  Each continuation byte
+will abide the same logic, so that one can easily skip over flags that one
+does not understand or know about.  The first bit of the second flag byte
+will be denoted as bit 8.
+
+To allow for easier extension of the payload without having to increase
+the version number, v1 handlers MUST be prepared to skip over all the flags
+bytes present before continuing the parsing of the payload.
+
+Extensions following the flags are listed in the order they are listed as
+present by the flags, in increasing bit order.  This means extension specified
+by bit 0 will be serialized before that of bit 2, for instance.
+
+* For "git" versionning, the following fields are following the <flags>:
+
+    <commit-len>    1 byte      amount of nybbles in the commit identifier
+    <commit-bin>    variable    identifies the GIT commit SHA1 identifier
+
+The <commit-len> byte holds the amount of significant nybbles present
+in the <commit-bin> field.  One byte is made of 2 nybbles, and each nybble
+corresponds to an hexadecimal digit.  For instance "2ad35" is made of 5
+nybbles, stored in 3 bytes (the last nybble is zeroed and MUST be ignored).
+The binary representation is big-endian.
+
+* OS codes are specified thusly:
+
+    <os>            1 byte      OS code
+
+The following table represents the operating systems we advertise:
+
+    0               Unknown OS
+    1               Generic UNIX-type
+    2               Generic UNIX BSD type
+    3               Linux
+    4               FreeBSD
+    5               NetBSD
+    6               Windows
+    7               Mac OSX
+
+The total payload size is variable but typically the git commit
+identifier will fit in 4 bytes, making the extension payload 20 bytes.
+
+The payload is never deflated nor COBS-encoded.

gtk-gnutella-0.97.tar.bz2/doc/public/GGEP/H -> gtk-gnutella-0.97.1.tar.bz2/doc/public/GGEP/H Changed

gtk-gnutella-0.97.tar.bz2/doc/public/GGEP/T -> gtk-gnutella-0.97.1.tar.bz2/doc/public/GGEP/T Changed

gtk-gnutella-0.97.tar.bz2/doc/public/GGEP/u -> gtk-gnutella-0.97.1.tar.bz2/doc/public/GGEP/u Changed

gtk-gnutella-0.97.tar.bz2/extra_files/Jmakefile -> gtk-gnutella-0.97.1.tar.bz2/extra_files/Jmakefile Changed

gtk-gnutella-0.97.tar.bz2/extra_files/el/FAQ -> gtk-gnutella-0.97.1.tar.bz2/extra_files/el/FAQ Changed

gtk-gnutella-0.97.tar.bz2/extra_files/el/Jmakefile -> gtk-gnutella-0.97.1.tar.bz2/extra_files/el/Jmakefile Changed

gtk-gnutella-0.97.tar.bz2/extra_files/en/FAQ -> gtk-gnutella-0.97.1.tar.bz2/extra_files/en/FAQ Changed

gtk-gnutella-0.97.tar.bz2/extra_files/en/Jmakefile -> gtk-gnutella-0.97.1.tar.bz2/extra_files/en/Jmakefile Changed

gtk-gnutella-0.97.tar.bz2/extra_files/geo-ip.txt -> gtk-gnutella-0.97.1.tar.bz2/extra_files/geo-ip.txt Changed

@@ -1,6 +1,6 @@
 # From http://www.maxmind.com/app/geoip_country
 # Redistributed under the OPEN DATA LICENSE (see GEO_LICENCE)
-# Conversion for GTKG generated on Wed Jul  6 22:00:56 2011 GMT
+# Conversion for GTKG generated on Sat Sep  3 11:31:46 2011 GMT
 1.0.0.0 - 1.0.0.255 au
 1.0.1.0 - 1.0.3.255 cn
 1.0.4.0 - 1.0.7.255 au
@@ -126,7 +126,8 @@
 2.22.226.0 - 2.22.227.255 se
 2.22.228.0 - 2.22.231.255 eu
 2.22.232.0 - 2.22.232.255 gb
-2.22.233.0 - 2.23.31.255 eu
+2.22.233.0 - 2.22.233.255 nl
+2.22.234.0 - 2.23.31.255 eu
 2.23.32.0 - 2.23.47.255 se
 2.23.48.0 - 2.23.255.255 eu
 2.24.0.0 - 2.31.255.255 gb
@@ -210,7 +211,9 @@
 8.21.36.0 - 8.21.39.255 ca
 8.21.40.0 - 8.21.49.255 us
 8.21.50.0 - 8.21.50.255 ca
-8.21.51.0 - 9.19.255.255 us
+8.21.51.0 - 8.24.223.255 us
+8.24.224.0 - 8.24.236.255 ca
+8.24.237.0 - 9.19.255.255 us
 9.20.0.0 - 9.20.127.255 gb
 9.20.128.0 - 9.255.255.255 us
 11.0.0.0 - 12.1.52.63 us
@@ -373,9 +376,7 @@
 12.129.251.152 - 12.129.251.159 de
 12.129.251.160 - 12.130.81.95 us
 12.130.81.96 - 12.130.81.103 ca
-12.130.81.104 - 12.130.88.127 us
-12.130.88.128 - 12.130.88.255 ir
-12.130.89.0 - 12.131.209.47 us
+12.130.81.104 - 12.131.209.47 us
 12.131.209.48 - 12.131.209.55 pr
 12.131.209.56 - 12.132.43.175 us
 12.132.43.176 - 12.132.43.183 vi
@@ -1261,7 +1262,9 @@
 31.12.16.0 - 31.12.31.255 mk
 31.12.32.0 - 31.12.63.255 de
 31.12.64.0 - 31.12.71.255 be
-31.12.72.0 - 31.12.127.255 gb
+31.12.72.0 - 31.12.87.255 gb
+31.12.88.0 - 31.12.88.128 nl
+31.12.88.129 - 31.12.127.255 gb
 31.12.128.0 - 31.12.255.255 ua
 31.13.0.0 - 31.13.7.255 gb
 31.13.8.0 - 31.13.15.255 se
@@ -1598,7 +1601,8 @@
 31.148.208.0 - 31.148.209.255 ua
 31.148.210.0 - 31.148.215.255 ru
 31.148.216.0 - 31.148.243.255 cz
-31.148.244.0 - 31.148.251.255 ru
+31.148.244.0 - 31.148.247.255 ru
+31.148.248.0 - 31.148.251.255 cz
 31.148.252.0 - 31.148.255.255 ua
 31.149.0.0 - 31.149.255.255 nl
 31.150.0.0 - 31.150.255.255 de
@@ -1638,7 +1642,9 @@
 31.170.112.0 - 31.170.119.255 ru
 31.170.120.0 - 31.170.127.255 gb
 31.170.128.0 - 31.170.159.255 ua
-31.170.160.0 - 31.170.167.255 us
+31.170.160.0 - 31.170.163.255 us
+31.170.164.0 - 31.170.165.255 gb
+31.170.166.0 - 31.170.167.255 us
 31.170.168.0 - 31.170.175.255 ru
 31.170.184.0 - 31.170.191.255 ru
 31.170.192.0 - 31.170.223.255 de
@@ -1649,8 +1655,8 @@
 31.171.132.0 - 31.171.132.63 us
 31.171.132.64 - 31.171.132.255 nl
 31.171.133.0 - 31.171.133.63 us
-31.171.133.64 - 31.171.133.255 nl
-31.171.134.0 - 31.171.135.255 us
+31.171.133.64 - 31.171.133.127 nl
+31.171.133.128 - 31.171.135.255 us
 31.171.136.0 - 31.171.143.255 it
 31.171.144.0 - 31.171.151.255 ch
 31.171.152.0 - 31.171.159.255 al
@@ -1674,7 +1680,10 @@
 31.172.160.0 - 31.172.191.255 im
 31.172.192.0 - 31.172.223.255 ru
 31.172.224.0 - 31.172.231.255 no
-31.172.232.0 - 31.172.255.255 gb
+31.172.232.0 - 31.172.232.45 fr
+31.172.232.46 - 31.172.232.47 gb
+31.172.232.48 - 31.172.232.111 fr
+31.172.232.112 - 31.172.255.255 gb
 31.173.0.0 - 31.173.255.255 ro
 31.174.0.0 - 31.175.255.255 pl
 31.176.0.0 - 31.176.127.255 tr
@@ -1727,7 +1736,8 @@
 31.186.176.0 - 31.186.183.255 ps
 31.186.184.0 - 31.186.191.255 cz
 31.186.192.0 - 31.186.223.255 pl
-31.186.224.0 - 31.186.255.255 gb
+31.186.224.0 - 31.186.224.255 us
+31.186.225.0 - 31.186.255.255 gb
 31.187.0.0 - 31.187.63.255 pl
 31.187.64.0 - 31.187.95.255 de
 31.187.96.0 - 31.187.103.255 ru
@@ -1752,9 +1762,7 @@
 31.193.0.0 - 31.193.1.255 gb
 31.193.2.0 - 31.193.2.127 cn
 31.193.2.128 - 31.193.2.255 gb
-31.193.3.0 - 31.193.5.255 cn
-31.193.6.0 - 31.193.6.127 de
-31.193.6.128 - 31.193.6.255 cn
+31.193.3.0 - 31.193.6.255 cn
 31.193.7.0 - 31.193.7.159 gb
 31.193.7.160 - 31.193.7.191 cn
 31.193.7.192 - 31.193.7.255 gb
@@ -1765,7 +1773,9 @@
 31.193.9.64 - 31.193.9.127 be
 31.193.9.128 - 31.193.9.191 gb
 31.193.9.192 - 31.193.11.255 cn
-31.193.12.0 - 31.193.13.255 gb
+31.193.12.0 - 31.193.13.127 gb
+31.193.13.128 - 31.193.13.191 cn
+31.193.13.192 - 31.193.13.255 us
 31.193.14.0 - 31.193.14.63 cn
 31.193.14.64 - 31.193.14.127 gb
 31.193.14.128 - 31.193.14.255 cn
@@ -1776,7 +1786,8 @@
 31.193.15.160 - 31.193.15.223 gb
 31.193.15.224 - 31.193.15.231 cn
 31.193.15.232 - 31.193.15.239 es
-31.193.15.240 - 31.193.15.255 gb
+31.193.15.240 - 31.193.15.247 gb
+31.193.15.248 - 31.193.15.255 cn
 31.193.16.0 - 31.193.31.255 it
 31.193.32.0 - 31.193.39.255 sm
 31.193.40.0 - 31.193.47.255 be
@@ -2056,7 +2067,8 @@
 31.209.104.0 - 31.209.104.0 tr
 31.209.104.1 - 31.209.111.255 cy
 31.209.112.0 - 31.209.127.255 de
-31.209.128.0 - 31.209.135.255 be
+31.209.128.0 - 31.209.128.255 cd
+31.209.129.0 - 31.209.135.255 be
 31.209.144.0 - 31.209.159.255 is
 31.209.160.0 - 31.209.175.255 de
 31.209.176.0 - 31.209.183.255 se
@@ -2301,7 +2313,6 @@
 36.248.0.0 - 36.251.255.255 cn
 36.252.0.0 - 36.253.255.255 np
 36.254.0.0 - 36.254.255.255 cn
-37.0.0.0 - 37.63.255.255 eu
 38.0.0.0 - 38.99.176.63 us
 38.99.176.64 - 38.99.176.127 ca
 38.99.176.128 - 38.111.102.255 us
@@ -2431,7 +2442,9 @@
 41.77.72.0 - 41.77.79.255 ug
 41.77.80.0 - 41.77.87.255 cm
 41.77.88.0 - 41.77.95.255 bw
-41.77.96.0 - 41.77.103.255 za
+41.77.96.0 - 41.77.111.255 za
+41.77.112.0 - 41.77.119.255 ma
+41.77.120.0 - 41.77.127.255 ga
 41.77.224.0 - 41.77.231.255 tz
 41.77.240.0 - 41.77.247.255 mz
 41.77.248.0 - 41.77.255.255 eg
@@ -2507,7 +2520,10 @@
 41.79.60.0 - 41.79.63.255 sc
 41.79.64.0 - 41.79.67.255 ng
 41.79.68.0 - 41.79.71.255 tz
-41.79.72.0 - 41.79.75.255 za
+41.79.72.0 - 41.79.83.255 za
+41.79.84.0 - 41.79.87.255 gh
+41.79.88.0 - 41.79.91.255 mw
+41.79.92.0 - 41.79.95.255 za
 41.79.228.0 - 41.79.231.255 ke
 41.79.232.0 - 41.79.235.255 cd
 41.79.236.0 - 41.79.239.255 gn
@@ -3030,8 +3046,8 @@
 46.16.152.0 - 46.16.159.255 ch
 46.16.160.0 - 46.16.167.255 gb
 46.16.168.0 - 46.16.170.255 it
-46.16.171.0 - 46.16.171.255 us
-46.16.172.0 - 46.16.175.255 it
+46.16.171.0 - 46.16.172.255 us
+46.16.173.0 - 46.16.175.255 it
 46.16.176.0 - 46.16.183.255 ru
 46.16.184.0 - 46.16.191.255 gb
 46.16.192.0 - 46.16.199.255 bg
@@ -3143,8 +3159,8 @@
 46.19.224.0 - 46.19.224.191 al
 46.19.224.192 - 46.19.224.255 rs
 46.19.225.0 - 46.19.227.255 al
-46.19.228.0 - 46.19.230.127 rs
-46.19.230.128 - 46.19.231.255 al
+46.19.228.0 - 46.19.230.255 rs
+46.19.231.0 - 46.19.231.255 al
 46.19.232.0 - 46.19.239.255 it
 46.19.240.0 - 46.19.247.255 be
 46.19.248.0 - 46.19.255.255 dk

gtk-gnutella-0.97.1.tar.bz2/extra_files/gtk-gnutella.128.png Added

gtk-gnutella-0.97.1.tar.bz2/extra_files/gtk-gnutella.256.png Added

gtk-gnutella-0.97.1.tar.bz2/extra_files/gtk-gnutella.512.png Added

gtk-gnutella-0.97.tar.bz2/extra_files/hostiles.txt -> gtk-gnutella-0.97.1.tar.bz2/extra_files/hostiles.txt Changed

gtk-gnutella-0.97.tar.bz2/extra_files/ja/FAQ -> gtk-gnutella-0.97.1.tar.bz2/extra_files/ja/FAQ Changed

gtk-gnutella-0.97.tar.bz2/extra_files/ja/Jmakefile -> gtk-gnutella-0.97.1.tar.bz2/extra_files/ja/Jmakefile Changed

gtk-gnutella-0.97.tar.bz2/extra_files/robots.txt -> gtk-gnutella-0.97.1.tar.bz2/extra_files/robots.txt Changed

gtk-gnutella-0.97.tar.bz2/extra_files/spam_sha1.txt -> gtk-gnutella-0.97.1.tar.bz2/extra_files/spam_sha1.txt Changed

gtk-gnutella-0.97.tar.bz2/gtk-gnutella.nsi -> gtk-gnutella-0.97.1.tar.bz2/gtk-gnutella.nsi Changed

gtk-gnutella-0.97.tar.bz2/gtk-gnutella_spec.SH -> gtk-gnutella-0.97.1.tar.bz2/gtk-gnutella_spec.SH Changed

gtk-gnutella-0.97.tar.bz2/install.SH -> gtk-gnutella-0.97.1.tar.bz2/install.SH Changed

gtk-gnutella-0.97.1.tar.bz2/osx Added

gtk-gnutella-0.97.1.tar.bz2/osx/Info-gtk-gnutella.plist Added

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>English</string>
+    <key>CFBundleExecutable</key>
+    <string>Gtk-Gnutella</string>
+    <key>CFBundleGetInfoString</key>
+    <string>0.97, (C) 2000-2011 gtk-gnutella http://gtk-gnutella.sourceforge.net</string>
+    <key>CFBundleIconFile</key>
+    <string>gtk-gnutella.icns</string>
+    <key>CFBundleIdentifier</key>
+    <string>net.sourceforge.gtk-gnutella</string>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
+    <key>CFBundleShortVersionString</key>
+    <string>0.97.0</string>
+    <key>CFBundleSignature</key>
+    <string>????</string>
+    <key>CFBundleVersion</key>
+    <string>19367</string>
+    <key>NSHumanReadableCopyright</key>
+    <string>Copyright 2000-2011 gtk-gnutella Team, GNU General Public License.</string>
+    <key>LSMinimumSystemVersion</key>
+    <string>10.4</string>
+</dict>
+</plist>

gtk-gnutella-0.97.1.tar.bz2/osx/gtk-gnutella.bundle Added

@@ -0,0 +1,139 @@
+<?xml version="1.0" standalone="no"?> 
+<app-bundle>
+
+  <meta>
+    
+    <prefix name="default">${env:JHBUILD_PREFIX}</prefix>
+
+    
+    <destination overwrite="yes">${project}/image</destination>
+
+    <image>
+      
+    </image>
+
+    
+    <run-install-name-tool/>
+ 
+    
+    <launcher-script>${project}/launcher.sh</launcher-script >
+
+    
+    
+    
+    <gtk>gtk+-2.0</gtk>
+  </meta>
+
+  
+  <plist>${project}/Info-gtk-gnutella.plist</plist>
+
+  <main-binary dest="${bundle}/Contents/Resources">${project}/bundle/bin/gtk-gnutella</main-binary>
+
+  
+  <binary>
+     ${prefix}/lib/${gtkdir}/modules/*.so
+  </binary>
+
+  
+  <binary>
+    ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/engines/*.so
+  </binary>
+
+  <binary>
+    ${prefix}/lib/gdk-pixbuf-2.0/${pkg:gdk-pixbuf-2.0:gdk_pixbuf_binary_version}/loaders/*.so
+  </binary>
+  
+
+  <binary>
+    ${prefix}/lib/gdk-pixbuf-2.0/*
+  </binary>
+  
+  
+  <translations name="gtk20">
+    ${prefix}/share/locale
+  </translations>
+
+
+  
+  <data dest="${bundle}/Contents/Resources">
+    ${project}/bundle
+  </data>
+
+  
+  <data>
+    ${prefix}/share/themes
+  </data>
+
+  
+  <data dest="${bundle}/Contents/Resources">
+    ${project}/gtk-gnutella.icns
+  </data>
+
+
+  
+  
+
+  
+
+  
+  
+
+</app-bundle>

gtk-gnutella-0.97.1.tar.bz2/osx/gtk-gnutella.icns Added

gtk-gnutella-0.97.1.tar.bz2/osx/launcher.sh Added

@@ -0,0 +1,171 @@
+#!/bin/sh
+
+if test "x$IGE_DEBUG_LAUNCHER" != x; then
+    set -x
+fi
+
+if test "x$IGE_DEBUG_GDB" != x; then
+    EXEC="gdb --args"
+else
+    EXEC=exec
+fi
+
+name="`basename $0`"
+tmp="`pwd`/$0"
+tmp=`dirname "$tmp"`
+tmp=`dirname "$tmp"`
+bundle=`dirname "$tmp"`
+bundle_contents="$bundle"/Contents
+bundle_res="$bundle_contents"/Resources
+bundle_lib="$bundle_res"/lib
+bundle_bin="$bundle_res"/bin
+bundle_data="$bundle_res"/share
+bundle_etc="$bundle_res"/etc
+
+export DYLD_LIBRARY_PATH="$bundle_lib"
+export XDG_CONFIG_DIRS="$bundle_etc"/xdg
+export XDG_DATA_DIRS="$bundle_data"
+export GTK_DATA_PREFIX="$bundle_res"
+export GTK_EXE_PREFIX="$bundle_res"
+export GTK_PATH="$bundle_res"
+
+export GTK2_RC_FILES="$bundle_etc/gtk-2.0/gtkrc"
+export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules"
+export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-2.0/gdk-pixbuf.loaders"
+export PANGO_RC_FILE="$bundle_etc/pango/pangorc"
+
+APP=name
+I18NDIR="$bundle_data/locale"
+# Set the locale-related variables appropriately:
+unset LANG LC_MESSAGES LC_MONETARY LC_COLLATE
+
+# Has a language ordering been set?
+# If so, set LC_MESSAGES and LANG accordingly; otherwise skip it.
+# First step uses sed to clean off the quotes and commas, to change - to _, and change the names for the chinese scripts from "Hans" to CN and "Hant" to TW.
+APPLELANGUAGES=`defaults read .GlobalPreferences AppleLanguages | sed -En   -e 's/\-/_/' -e 's/Hant/TW/' -e 's/Hans/CN/' -e 's/:space:*\"?(:alnum:_+)\"?,?/\1/p' `
+if test "$APPLELANGUAGES"; then
+    # A language ordering exists.
+    # Test, item per item, to see whether there is an corresponding locale.
+    for L in $APPLELANGUAGES; do
+	#test for exact matches:
+       if test -f "$I18NDIR/${L}/LC_MESSAGES/$APP.mo"; then
+	    export LANG=$L
+            break
+        fi
+	#This is a special case, because often the original strings are in US
+	#English and there is no translation file.
+	if test "x$L" == "xen_US"; then
+	    export LANG=$L
+	    break
+	fi
+	#OK, now test for just the first two letters:
+        if test -f "$I18NDIR/${L:0:2}/LC_MESSAGES/$APP.mo"; then
+	    export LANG=${L:0:2}
+	    break
+	fi
+	#Same thing, but checking for any english variant.
+	if test "x${L:0:2}" == "xen"; then
+	    export LANG=$L
+	    break
+	fi;
+    done  
+fi
+unset APPLELANGUAGES L
+
+# If we didn't get a language from the language list, try the Collation preference, in case it's the only setting that exists.
+APPLECOLLATION=`defaults read .GlobalPreferences AppleCollationOrder`
+if test -z ${LANG} -a -n $APPLECOLLATION; then
+    if test -f "$I18NDIR/${APPLECOLLATION:0:2}/LC_MESSAGES/$APP.mo"; then
+	export LANG=${APPLECOLLATION:0:2}
+    fi
+fi
+if test ! -z $APPLECOLLATION; then
+    export LC_COLLATE=$APPLECOLLATION
+fi
+unset APPLECOLLATION
+
+# Continue by attempting to find the Locale preference.
+APPLELOCALE=`defaults read .GlobalPreferences AppleLocale`
+
+if test -f "$I18NDIR/${APPLELOCALE:0:5}/LC_MESSAGES/$APP.mo"; then
+    if test -z $LANG; then 
+        export LANG="${APPLELOCALE:0:5}"
+    fi
+
+elif test -z $LANG -a -f "$I18NDIR/${APPLELOCALE:0:2}/LC_MESSAGES/$APP.mo"; then
+    export LANG="${APPLELOCALE:0:2}"
+fi
+
+#Next we need to set LC_MESSAGES. If at all possilbe, we want a full
+#5-character locale to avoid the "Locale not supported by C library"
+#warning from Gtk -- even though Gtk will translate with a
+#two-character code.
+if test -n $LANG; then 
+#If the language code matches the applelocale, then that's the message
+#locale; otherwise, if it's longer than two characters, then it's
+#probably a good message locale and we'll go with it.
+    if test $LANG == ${APPLELOCALE:0:5} -o $LANG != ${LANG:0:2}; then
+	export LC_MESSAGES=$LANG
+#Next try if the Applelocale is longer than 2 chars and the language
+#bit matches $LANG
+    elif test $LANG == ${APPLELOCALE:0:2} -a $APPLELOCALE > ${APPLELOCALE:0:2}; then
+	export LC_MESSAGES=${APPLELOCALE:0:5}
+#Fail. Get a list of the locales in $PREFIX/share/locale that match
+#our two letter language code and pick the first one, special casing
+#english to set en_US
+    elif test $LANG == "en"; then
+	export LC_MESSAGES="en_US"
+    else
+	LOC=`find $PREFIX/share/locale -name $LANG???`
+	for L in $LOC; do 
+	    export LC_MESSAGES=$L
+	done
+    fi
+else
+#All efforts have failed, so default to US english
+    export LANG="en_US"
+    export LC_MESSAGES="en_US"
+fi
+CURRENCY=`echo $APPLELOCALE |  sed -En 's/.*currency=(:alpha:+).*/\1/p'`
+if test "x$CURRENCY" != "x"; then 
+#The user has set a special currency. Gtk doesn't install LC_MONETARY files, but Apple does in /usr/share/locale, so we're going to look there for a locale to set LC_CURRENCY to.
+    if test -f /usr/local/share/$LC_MESSAGES/LC_MONETARY; then
+	if test -a `cat /usr/local/share/$LC_MESSAGES/LC_MONETARY` == $CURRENCY; then
+	    export LC_MONETARY=$LC_MESSAGES
+	fi
+    fi
+    if test -z "$LC_MONETARY"; then 
+	FILES=`find /usr/share/locale -name LC_MONETARY -exec grep -H $CURRENCY {} \;`
+	if test -n "$FILES"; then 
+	    export LC_MONETARY=`echo $FILES | sed -En 's%/usr/share/locale/(:alpha:_+)/LC_MONETARY.*%\1%p'`
+	fi
+    fi
+fi
+#No currency value means that the AppleLocale governs:
+if test -z "$LC_MONETARY"; then
+    LC_MONETARY=${APPLELOCALE:0:5}
+fi
+#For Gtk, which only looks at LC_ALL:
+export LC_ALL=$LC_MESSAGES
+
+unset APPLELOCALE FILES LOC
+
+if test -f "$bundle_lib/charset.alias"; then
+    export CHARSETALIASDIR="$bundle_lib"
+fi
+
+# Extra arguments can be added in environment.sh.
+EXTRA_ARGS=
+if test -f "$bundle_res/environment.sh"; then
+  source "$bundle_res/environment.sh"
+fi
+
+# Strip out the argument added by the OS.
+if  x`echo "x$1" | sed -e "s/^x-psn_.*//"` == x ; then
+    shift 1
+fi
+
+cd "$bundle_contents/Resources/"
+
+$EXEC "$bundle_contents/MacOS/$name-bin" $* $EXTRA_ARGS
+#$EXEC "$bundle_res/gtk-gnutella" $* $EXTRA_ARGS

gtk-gnutella-0.97.tar.bz2/pixmaps/Jmakefile -> gtk-gnutella-0.97.1.tar.bz2/pixmaps/Jmakefile Changed

gtk-gnutella-0.97.tar.bz2/po/POTFILES.in -> gtk-gnutella-0.97.1.tar.bz2/po/POTFILES.in Changed

gtk-gnutella-0.97.tar.bz2/po/de.po -> gtk-gnutella-0.97.1.tar.bz2/po/de.po Changed

@@ -1,4 +1,4 @@
-# $Id: de.po 19240 2011-06-04 14:21:22Z rmanfredi $
+# $Id$
 #
 # German translations for gtk-gnutella package.
 # Copyright (C) 2000-2001 Yann Grossel.
@@ -938,16 +938,16 @@
 msgstr "IP lehnt Uploads ab"
 
 #, c-format
-msgid " - Newer versions available: release %s / from SVN %s"
-msgstr " - Neuere Versionen verfügbar: Release %s / SVN %s"
+msgid " - Newer versions available: release %s / from git %s"
+msgstr " - Neuere Versionen verfügbar: Release %s / git %s"
 
 #, c-format
 msgid " - Newer version available: release %s"
 msgstr " - Neuere Version verfügbar: Release %s"
 
 #, c-format
-msgid " - Newer version available: from SVN %s"
-msgstr " - Neuere Version verfügbar: SVN %s"
+msgid " - Newer version available: from git %s"
+msgstr " - Neuere Version verfügbar: git %s"
 
 msgid "No proxy"
 msgstr "Kein Proxy"
@@ -5862,7 +5862,7 @@
 msgid " with sources"
 msgstr " mit Quellen"
 
-msgid "$Id: de.po 19240 2011-06-04 14:21:22Z rmanfredi $"
+msgid "$Id$"
 msgstr ""
 
 #, fuzzy

gtk-gnutella-0.97.tar.bz2/po/el.po -> gtk-gnutella-0.97.1.tar.bz2/po/el.po Changed

@@ -1,4 +1,4 @@
-# $Id: el.po 19240 2011-06-04 14:21:22Z rmanfredi $
+# $Id$
 #
 # Greek translations for gtk-gnutella package.
 # Copyright (C) 2000-2001 Yann Grossel.
@@ -974,16 +974,16 @@
 msgstr "Η IP αρνείται τις αποστολές"
 
 #, fuzzy, c-format
-msgid " - Newer versions available: release %s / from SVN %s"
-msgstr " - Υπάρχουν νεότερες εκδόσεις διαθέσιμες: έκδοση %s / από CVS %s"
+msgid " - Newer versions available: release %s / from git %s"
+msgstr " - Υπάρχουν νεότερες εκδόσεις διαθέσιμες: έκδοση %s / από git %s"
 
 #, c-format
 msgid " - Newer version available: release %s"
 msgstr " - Υπάρχει νεότερη έκδοση διαθέσιμη: έκδοση %s"
 
 #, fuzzy, c-format
-msgid " - Newer version available: from SVN %s"
-msgstr " - Υπάρχει νεότερη έκδοση διαθέσιμη: από CVS %s"
+msgid " - Newer version available: from git %s"
+msgstr " - Υπάρχει νεότερη έκδοση διαθέσιμη: από git %s"
 
 msgid "No proxy"
 msgstr "Χωρίς διαμεσολαβητή"
@@ -6004,7 +6004,7 @@
 msgid " with sources"
 msgstr " με πηγές"
 
-msgid "$Id: el.po 19240 2011-06-04 14:21:22Z rmanfredi $"
+msgid "$Id$"
 msgstr ""
 
 #, fuzzy

gtk-gnutella-0.97.tar.bz2/po/es.po -> gtk-gnutella-0.97.1.tar.bz2/po/es.po Changed

@@ -1,4 +1,4 @@
-# $Id: es.po 19240 2011-06-04 14:21:22Z rmanfredi $
+# $Id$
 #
 # Spanish translation for gtk-gnutella package.
 # Copyright (c) 2000-2001, Yann Grossel.
@@ -16,10 +16,10 @@
 "PO-Revision-Date: 2009-03-27 00:04+0100\n"
 "Last-Translator: Larry Nieves <lnieves@315-web.com>\n"
 "Language-Team: Spanish <lanieves@gmail.com>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Poedit-Language: Spanish\n"
 
@@ -932,16 +932,16 @@
 msgstr "IP denegando subidas"
 
 #, c-format
-msgid " - Newer versions available: release %s / from SVN %s"
-msgstr "- Nuevas versiones disponibles: versión %s / basada en SVN %s"
+msgid " - Newer versions available: release %s / from git %s"
+msgstr "- Nuevas versiones disponibles: versión %s / basada en git %s"
 
 #, c-format
 msgid " - Newer version available: release %s"
 msgstr "- Nueva versión disponible: versión %s"
 
 #, c-format
-msgid " - Newer version available: from SVN %s"
-msgstr "- Nueva versión disponible: basada en SVN %s"
+msgid " - Newer version available: from git %s"
+msgstr "- Nueva versión disponible: basada en git %s"
 
 msgid "No proxy"
 msgstr "No hay proxy"
@@ -6023,7 +6023,7 @@
 msgid " with sources"
 msgstr " con fuentes"
 
-msgid "$Id: gtk-gnutella.pot 19240 2011-06-04 14:21:22Z rmanfredi $"
+msgid "$Id$"
 msgstr ""
 
 msgid "%v/%u (%P%%)"

gtk-gnutella-0.97.tar.bz2/po/fr.po -> gtk-gnutella-0.97.1.tar.bz2/po/fr.po Changed

@@ -1,4 +1,4 @@
-# $Id: fr.po 19336 2011-07-17 23:04:09Z rmanfredi $
+# $Id$
 #
 # French translations for gtk-gnutella package.
 # Copyright (C) 2000-2001 Yann Grossel.
@@ -13,13 +13,13 @@
 "Project-Id-Version: gtk-gnutella 0.96.7u\n"
 "Report-Msgid-Bugs-To: gtk-gnutella-devel@lists.sf.net\n"
 "POT-Creation-Date: 2011-06-04 16:18+0200\n"
-"PO-Revision-Date: 2008-09-03 23:05+0100\n"
-"Last-Translator: stegozor <stegozor@gmail.com>\n"
+"PO-Revision-Date: 2011-08-07 06:02+0100\n"
+"Last-Translator: \n"
 "Language-Team: French <gtk-gnutella-devel@lists.sourceforge.net>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Poedit-Language: French\n"
 
@@ -91,7 +91,7 @@
 msgstr "Pas de créneau libre pour télécharger (démarrage)"
 
 msgid "Connection failed (Out of file descriptors?)"
-msgstr "Echec de connexion (plus de descripteurs de fichiers ?)"
+msgstr "Échec de connexion (plus de descripteurs de fichiers ?)"
 
 msgid "Connection failed"
 msgstr "La connexion a échoué"
@@ -148,14 +148,14 @@
 msgstr "Remis dans la file explicitement"
 
 msgid "Failed (Header line too large)"
-msgstr "Echec (Ligne d'en-tête trop longue)"
+msgstr "Échec (Ligne d'en-tête trop longue)"
 
 #, c-format
 msgid "Failed (%s)"
-msgstr "Echec (%s)"
+msgstr "Échec (%s)"
 
 msgid "Failed (Input buffer full)"
-msgstr "Echec (Tampon d'entrée plein)"
+msgstr "Échec (Tampon d'entrée plein)"
 
 msgid "Connection not kept-alive (EOF)"
 msgstr "Connexion non maintenue en vie (EOF)"
@@ -165,18 +165,18 @@
 
 #, c-format
 msgid "Can't check resume data: %s"
-msgstr "Impossible de vérifier les données de reprise: %s"
+msgstr "Impossible de vérifier les données de reprise : %s"
 
 #, c-format
 msgid "Can't stat opened file: %s"
-msgstr "Impossible d'interroger le fichier ouvert: %s"
+msgstr "Impossible d'interroger le fichier ouvert : %s"
 
 msgid "Stopped (Output file size changed)"
 msgstr "Stoppé (La taille du fichier de sortie a changé)"
 
 #, c-format
 msgid "Can't read resume data: %s"
-msgstr "Impossible de lire les données de reprise: %s"
+msgstr "Impossible de lire les données de reprise : %s"
 
 msgid "Short read on resume data"
 msgstr "Lecture courte sur les données de reprise"
@@ -187,10 +187,10 @@
 
 #, c-format
 msgid "Can't save data: %s"
-msgstr "Impossible de sauver les données: %s"
+msgstr "Impossible d'enregistrer les données : %s"
 
 msgid "Partial write to file"
-msgstr "Ecriture partielle dans le fichier"
+msgstr "Écriture partielle dans le fichier"
 
 msgid "Requeued after trimmed data"
 msgstr "Remis dans la file après épuration des données"
@@ -206,7 +206,7 @@
 msgstr "Remis dans la file à cause de téléchargements concurrents"
 
 msgid "Weird HTTP status"
-msgstr "Statut HTTP bizarre"
+msgstr "État HTTP bizarre"
 
 msgid "Download was a duplicate"
 msgstr "Le téléchargement était un doublon"
@@ -247,10 +247,10 @@
 
 #, c-format
 msgid "Failed (Read error: %s)"
-msgstr "Echec (Erreur de lecture: %s)"
+msgstr "Échec (Erreur de lecture : %s)"
 
 msgid "Timeout reading HTTP status"
-msgstr "Timeout en lisant le statut HTTP"
+msgstr "Timeout en lisant l'état HTTP"
 
 msgid "Timeout reading headers"
 msgstr "Timeout en lisant les en-têtes"
@@ -288,7 +288,7 @@
 
 #, c-format
 msgid ", ETA: %s"
-msgstr ", ETA: %s"
+msgstr ", ETA : %s"
 
 msgid "Server did not supply identification"
 msgstr "Le serveur n'a pas envoyé d'identification"
@@ -309,7 +309,7 @@
 msgstr "La plage ne correspond pas"
 
 msgid "Weird server-side chunk shrinking"
-msgstr "Rétrécissement bizarre de bloc coté serveur"
+msgstr "Rétrécissement bizarre de bloc côté serveur"
 
 msgid "Content-Length mismatch"
 msgstr "Content-Length ne correspond pas"
@@ -328,27 +328,27 @@
 
 #, c-format
 msgid "Cannot open %s: %s"
-msgstr "Impossible d'ouvrir %s: %s)"
+msgstr "Impossible d'ouvrir %s : %s)"
 
 msgid "Cannot resume: file gone"
-msgstr "Impossible de reprendre: le fichier n'est plus là"
+msgstr "Impossible de reprendre : le fichier n'est plus là"
 
 #, c-format
 msgid "Cannot write into file: %s"
-msgstr "Impossible d'écrire dans le fichier: %s"
+msgstr "Impossible d'écrire dans le fichier : %s"
 
 msgid "Stopped (Read buffer full)"
 msgstr "Stoppé (Tampon de lecture plein)"
 
 msgid "Failed (Completed?)"
-msgstr "Echec (Terminé ?)"
+msgstr "Échec (Terminé ?)"
 
 msgid "Could not send whole HTTP request"
 msgstr "Impossible d'envoyer la requête HTTP complète"
 
 #, c-format
 msgid "Write failed: %s"
-msgstr "Erreur d'écriture: %s"
+msgstr "Erreur d'écriture : %s"
 
 msgid "Malformed push reply"
 msgstr "Réponse 'push' mal formée"
@@ -369,7 +369,7 @@
 msgstr ", g2"
 
 msgid ", vendor?"
-msgstr ", vendeur?"
+msgstr ", vendeur ?"
 
 #, c-format
 msgid "<Browse Host %s>"
@@ -399,10 +399,10 @@
 
 #, c-format
 msgid "Downloading (TR: %s)"
-msgstr "Téléchargement (TR: %s)"
+msgstr "Téléchargement (TR : %s)"
 
 msgid "Seeding"
-msgstr "Pollenisation"
+msgstr "Pollinisation"
 
 msgid "Computing TTH"
 msgstr "Calcul du TTH"
@@ -416,7 +416,6 @@
 msgid "Waiting for SHA1 check"
 msgstr "En attente de la vérification SHA1"
 
-
 msgid "SHA1"
 msgstr "SHA1"
 
@@ -427,7 +426,7 @@
 msgstr "échoué"
 
 msgid "not computed yet"
-msgstr "pas calculé pour l'instant"
+msgstr "pas encore calculé"
 
 msgid "Waiting for moving..."
 msgstr "En attente de déplacement..."
@@ -476,7 +475,7 @@
 msgstr "Trop grand"

gtk-gnutella-0.97.tar.bz2/po/gtk-gnutella.pot -> gtk-gnutella-0.97.1.tar.bz2/po/gtk-gnutella.pot Changed

gtk-gnutella-0.97.tar.bz2/po/hu.po -> gtk-gnutella-0.97.1.tar.bz2/po/hu.po Changed

gtk-gnutella-0.97.tar.bz2/po/it.po -> gtk-gnutella-0.97.1.tar.bz2/po/it.po Changed

@@ -1,4 +1,4 @@
-# $Id: it.po 19240 2011-06-04 14:21:22Z rmanfredi $
+# $Id$
 #
 # Messaggi in italiano per gtk-gnutella.
 # Copyright (C) 2000-2001 Yann Grossel.
@@ -970,16 +970,16 @@
 msgstr "IP che rifiuta caricamenti"
 
 #, fuzzy, c-format
-msgid " - Newer versions available: release %s / from SVN %s"
-msgstr " - Versioni più recenti disponibili: rilascio %s / dal CVS %s"
+msgid " - Newer versions available: release %s / from git %s"
+msgstr " - Versioni più recenti disponibili: rilascio %s / dal git %s"
 
 #, c-format
 msgid " - Newer version available: release %s"
 msgstr " - Versione più recente disponibile: rilascio %s"
 
 #, fuzzy, c-format
-msgid " - Newer version available: from SVN %s"
-msgstr " - Versione più recente disponibile: dal CVS %s"
+msgid " - Newer version available: from git %s"
+msgstr " - Versione più recente disponibile: dal git %s"
 
 msgid "No proxy"
 msgstr ""
@@ -6098,7 +6098,7 @@
 msgid " with sources"
 msgstr " con i sorgenti"
 
-msgid "$Id: it.po 19240 2011-06-04 14:21:22Z rmanfredi $"
+msgid "$Id$"
 msgstr ""
 
 #, fuzzy

gtk-gnutella-0.97.tar.bz2/po/ja.po -> gtk-gnutella-0.97.1.tar.bz2/po/ja.po Changed

gtk-gnutella-0.97.tar.bz2/po/nb.po -> gtk-gnutella-0.97.1.tar.bz2/po/nb.po Changed

@@ -1,4 +1,4 @@
-# $Id: nb.po 19240 2011-06-04 14:21:22Z rmanfredi $
+# $Id$
 #
 # Norwegian Bokmal translations for gtk-gnutella package.
 # Copyright (C) 2000-2001 Yann Grossel.
@@ -929,16 +929,16 @@
 msgstr "IP nekter opplastinger"
 
 #, c-format
-msgid " - Newer versions available: release %s / from SVN %s"
-msgstr " - Nyere versjoner tilgjengelig: utgivelse %s / fra SVN %s"
+msgid " - Newer versions available: release %s / from git %s"
+msgstr " - Nyere versjoner tilgjengelig: utgivelse %s / fra git %s"
 
 #, c-format
 msgid " - Newer version available: release %s"
 msgstr "- Nyere versjon tilgjengelig: utgivelse %s"
 
 #, c-format
-msgid " - Newer version available: from SVN %s"
-msgstr " - Nyere versjon tilgjengelig: fra SVN %s"
+msgid " - Newer version available: from git %s"
+msgstr " - Nyere versjon tilgjengelig: fra git %s"
 
 msgid "No proxy"
 msgstr "Ingen mellomtjener"
@@ -5932,7 +5932,7 @@
 msgid " with sources"
 msgstr " med kilder"
 
-msgid "$Id: nb.po 19240 2011-06-04 14:21:22Z rmanfredi $"
+msgid "$Id$"
 msgstr ""
 
 msgid "%v/%u (%P%%)"

gtk-gnutella-0.97.tar.bz2/po/nl.po -> gtk-gnutella-0.97.1.tar.bz2/po/nl.po Changed

@@ -1,4 +1,4 @@
-# $Id: nl.po 19241 2011-06-07 07:21:57Z nonamer $
+# $Id$
 #
 # Dutch translations for gtk-gnutella package.
 # Copyright (C) 2000-2001 Yann Grossel.
@@ -911,16 +911,16 @@
 msgstr "IP weigert uploads"
 
 #, c-format
-msgid " - Newer versions available: release %s / from SVN %s"
-msgstr " - Nieuwere versie beschikbaar: Versie %s / van SVN %s"
+msgid " - Newer versions available: release %s / from git %s"
+msgstr " - Nieuwere versie beschikbaar: Versie %s / van git %s"
 
 #, c-format
 msgid " - Newer version available: release %s"
 msgstr " - Nieuwere versie beschikbaar: versie %s"
 
 #, c-format
-msgid " - Newer version available: from SVN %s"
-msgstr " - Nieuwere versie beschikbaar van SVN %s"
+msgid " - Newer version available: from git %s"
+msgstr " - Nieuwere versie beschikbaar van git %s"
 
 msgid "No proxy"
 msgstr "Geen proxy"
@@ -4742,8 +4742,8 @@
 msgid " with sources"
 msgstr " met bronnen"
 
-msgid "$Id: nl.po 19241 2011-06-07 07:21:57Z nonamer $"
-msgstr "$Id: nl.po 19241 2011-06-07 07:21:57Z nonamer $"
+msgid "$Id$"
+msgstr "$Id$"
 
 msgid "%v/%u (%P%%)"
 msgstr "%v/%u (%P%%)"

gtk-gnutella-0.97.tar.bz2/po/tr.po -> gtk-gnutella-0.97.1.tar.bz2/po/tr.po Changed

gtk-gnutella-0.97.tar.bz2/po/uk.po -> gtk-gnutella-0.97.1.tar.bz2/po/uk.po Changed

gtk-gnutella-0.97.tar.bz2/po/zh_CN.po -> gtk-gnutella-0.97.1.tar.bz2/po/zh_CN.po Changed

gtk-gnutella-0.97.tar.bz2/scripts/fix_copyright.pl -> gtk-gnutella-0.97.1.tar.bz2/scripts/fix_copyright.pl Changed

gtk-gnutella-0.97.tar.bz2/scripts/generic-cat -> gtk-gnutella-0.97.1.tar.bz2/scripts/generic-cat Changed

gtk-gnutella-0.97.tar.bz2/scripts/geo-to-db.pl -> gtk-gnutella-0.97.1.tar.bz2/scripts/geo-to-db.pl Changed

gtk-gnutella-0.97.1.tar.bz2/scripts/git-version.sh Added

@@ -0,0 +1,74 @@
+#!/bin/sh
+
+DIR=scripts
+
+if test -d $DIR; then TOP=.;
+elif test -d ../$DIR; then TOP=..;
+elif test -d ../../$DIR; then TOP=../..;
+elif test -d ../../../$DIR; then TOP=../../..;
+elif test -d ../../../../$DIR; then TOP=../../../..;
+else
+	echo "Can't find the $DIR directory."; exit 1
+fi
+
+# Build reasonable default
+file=$TOP/src/gtk-gnutella.h
+
+version=`grep "define GTA_VERSION" $file | head -n1 | awk '{ print $3 }'`
+subversion=`grep "define GTA_SUBVERSION" $file | head -n1 | awk '{ print $3 }'`
+patchlevel=`grep "define GTA_PATCHLEVEL" $file | head -n1 | awk '{ print $3 }'`
+revchar=`grep "define GTA_REVCHAR" $file | head -n1 | awk '{ print $3 }'`
+revchar=`echo $revchar | sed -e 's/"//g'`
+
+DEF_VER=$version.$subversion.$patchlevel$revchar
+
+LF='
+'
+
+# First see if there is a version file (included in release tarballs),
+# then try git-describe, then default.
+if test -s $TOP/version
+then
+	VN=`cat $TOP/version` || VN="$DEF_VER"
+fi
+
+if test -d $TOP/.git && git describe >/dev/null 2>&1 &&
+	VN=`git describe --match "v0-9*" --abbrev=4 HEAD 2>/dev/null` &&
+	case "$VN" in
+	*$LF*) exit 1 ;;
+	v0-9*)
+		git update-index -q --refresh
+		test -z "`git diff-index --name-only HEAD --`" ||
+		VN="$VN-dirty" ;;
+	esac
+then
+	VN="$VN"
+else
+	VN="$DEF_VER"
+fi
+
+VN=`echo $VN | sed -e s/^v//`
+
+echo $VN
+V=$VN
+
+VMajor=`echo $V | sed -e 's/^$0-9*$.*/\1/'`
+V=`echo $V | sed -e s/^$VMajor//`
+
+VMinor=`echo $V | sed -e 's/^\.$0-9*$.*/\1/'`
+V=`echo $V | sed -e s/^.$VMinor//`
+case "$V" in
+.*)
+	VPatch=`echo $V | sed -e 's/^\.$0-9*$.*/\1/'`
+	V=`echo $V | sed -e s/^.$VPatch//`
+	;;
+*) VPatch=0;;
+esac
+
+# Strip "u" or "b" in the version, if present
+case "$V" in
+a-z*) VRev=`echo $V | sed -e s/^a-z//`;;
+*) VRev=$V;;
+esac
+
+VRev=`echo $VRev | sed -e s/^-//`

gtk-gnutella-0.97.tar.bz2/scripts/gtkg-version -> gtk-gnutella-0.97.1.tar.bz2/scripts/gtkg-version Changed

@@ -41,26 +41,11 @@
 
 oldrev=`grep Revision src/revision.h 2>/dev/null | head -n1 | cut -d' ' -f4`
 
-if test -d .svn; then
-	revnum=`svn info . 2>/dev/null | grep '^Revision' | \
-		head -n1 | cut -d' ' -f2`
-	if  "x$revnum" = x ; then
-		# No svn installed, grab the first digit below the "dir" key then
-		revnum=`awk '
-			BEGIN { s = 0; n = 1; }
-			/^dir/ { s = 1; }
-			/^0-9+/ { if (s && n) { print $1; n = 0;} }' .svn/entries`
-	fi
-else
-	revnum="$oldrev" # keep as is
-fi
-
-FILE=src/gtk-gnutella.h
-
-version=`grep "define GTA_VERSION" $FILE | head -n1 | awk '{ print $3 }'`
-subversion=`grep "define GTA_SUBVERSION" $FILE | head -n1 | awk '{ print $3 }'`
-patchlevel=`grep "define GTA_PATCHLEVEL" $FILE | head -n1 | awk '{ print $3 }'`
-revchar=`grep "define GTA_REVCHAR" $FILE | head -n1 | awk '{ print $3 }'`
-revchar=`echo $revchar | sed -e 's/"//g'`
-
-echo $version.$subversion.$patchlevel$revchar-$revnum
+. scripts/git-version.sh >/dev/null
+case "$VRev" in
+'') revnum=;;
+*) revnum="-$VRev";;
+esac
+
+# These variables computed in git-version.sh
+echo $version.$subversion.$patchlevel$revchar$revnum

gtk-gnutella-0.97.tar.bz2/scripts/magnet-handler.sh -> gtk-gnutella-0.97.1.tar.bz2/scripts/magnet-handler.sh Changed

gtk-gnutella-0.97.tar.bz2/scripts/sha1_cache.pl -> gtk-gnutella-0.97.1.tar.bz2/scripts/sha1_cache.pl Changed

gtk-gnutella-0.97.tar.bz2/scripts/sha1_cache.sh -> gtk-gnutella-0.97.1.tar.bz2/scripts/sha1_cache.sh Changed

gtk-gnutella-0.97.tar.bz2/scripts/svn-revision -> gtk-gnutella-0.97.1.tar.bz2/scripts/svn-revision Changed

gtk-gnutella-0.97.tar.bz2/src/Jmakefile -> gtk-gnutella-0.97.1.tar.bz2/src/Jmakefile Changed

gtk-gnutella-0.97.tar.bz2/src/casts.h -> gtk-gnutella-0.97.1.tar.bz2/src/casts.h Changed

gtk-gnutella-0.97.tar.bz2/src/common.h -> gtk-gnutella-0.97.1.tar.bz2/src/common.h Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: common.h 19200 2011-06-01 16:44:40Z rmanfredi $
- *
  * Copyright (c) 2001-2003, Richard Eckart
  *
  *----------------------------------------------------------------------
@@ -536,8 +534,8 @@
 #define G_GNUC_PURE __attribute__((__pure__))
 #else
 #define G_GNUC_PURE
-#endif	/* GCC >= 3.0 */
-#endif	/* G_GNUC_MALLOC */
+#endif	/* GCC >= 2.96 */
+#endif	/* G_GNUC_PURE */
 
 #ifndef G_GNUC_MALLOC
 #if defined(HASATTRIBUTE) && HAS_GCC(3, 0)
@@ -547,14 +545,37 @@
 #endif	/* GCC >= 3.0 */
 #endif	/* G_GNUC_MALLOC */
 
+/**
+ * A hot function is optimized more aggressively.
+ */
+#ifndef G_GNUC_HOT
+#if defined(HASATTRIBUTE) && HAS_GCC(4, 3)
+#define G_GNUC_HOT __attribute__((hot))
+#else
+#define G_GNUC_HOT
+#endif	/* GCC >= 4.3 */
+#endif	/* G_GNUC_HOT */
+
+/**
+ * A cold function is unlikely executed, and is optimized for size rather
+ * than speed.  All branch tests leading to it are marked "unlikely".
+ */
+#ifndef G_GNUC_COLD
+#if defined(HASATTRIBUTE) && HAS_GCC(4, 3)
+#define G_GNUC_COLD __attribute__((cold))
+#else
+#define G_GNUC_COLD
+#endif	/* GCC >= 4.3 */
+#endif	/* G_GNUC_COLD */
+
 #if defined(HASATTRIBUTE) && HAS_GCC(3, 1)
-#define ALWAYS_INLINE __attribute__((__always_inline__))
+#define ALWAYS_INLINE __attribute__((always_inline))
 #else
 #define ALWAYS_INLINE
 #endif	/* GCC >= 3.1 */
 
 #if defined(HASATTRIBUTE) && HAS_GCC(3, 1)
-#define NO_INLINE __attribute__((__noinline__))
+#define NO_INLINE __attribute__((noinline))
 #else
 #define NO_INLINE
 #endif	/* GCC >= 3.1 */

gtk-gnutella-0.97.tar.bz2/src/core/Jmakefile -> gtk-gnutella-0.97.1.tar.bz2/src/core/Jmakefile Changed

gtk-gnutella-0.97.tar.bz2/src/core/alive.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/alive.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/alive.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/alive.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/ban.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/ban.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/ban.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/ban.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/bh_download.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/bh_download.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/bh_download.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/bh_download.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/bh_upload.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/bh_upload.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/bh_upload.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/bh_upload.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/bitzi.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/bitzi.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/bitzi.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/bitzi.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/bogons.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/bogons.c Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: bogons.c 19266 2011-06-15 16:02:31Z rmanfredi $
- *
  * Copyright (c) 2004, Raphael Manfredi
  *
  *----------------------------------------------------------------------
@@ -35,8 +33,6 @@
 
 #include "common.h"
 
-RCSID("$Id: bogons.c 19266 2011-06-15 16:02:31Z rmanfredi $")
-
 #include "bogons.h"
 #include "settings.h"
 
@@ -70,7 +66,7 @@
  *
  * @returns the amount of entries loaded.
  */
-static int
+static G_GNUC_COLD int
 bogons_load(FILE *f)
 {
 	char line1024;
@@ -178,29 +174,32 @@
  * The selected file will then be monitored and a reloading will occur
  * shortly after a modification.
  */
-static void
+static G_GNUC_COLD void
 bogons_retrieve(void)
 {
 	FILE *f;
 	int idx;
 	char *filename;
+	file_path_t fp4;
+	unsigned length = 0;	
+	char *tmp;
+
+	file_path_set(&fplength++, settings_config_dir(), bogons_file);
+	tmp = get_folder_path(PRIVLIB_PATH, NULL);
+	if (tmp != NULL)
+		file_path_set(&fplength++, tmp, bogons_file);
+	
+	file_path_set(&fplength++, PRIVLIB_EXP, bogons_file);
 #ifndef OFFICIAL_BUILD
-	static file_path_t fp3;
-#else
-	static file_path_t fp2;
+	file_path_set(&fplength++, PACKAGE_EXTRA_SOURCE_DIR, bogons_file);
 #endif
 
-	file_path_set(&fp0, settings_config_dir(), bogons_file);
-	file_path_set(&fp1, PRIVLIB_EXP, bogons_file);
-#ifndef OFFICIAL_BUILD
-	file_path_set(&fp2, PACKAGE_EXTRA_SOURCE_DIR, bogons_file);
-#endif
+	g_assert(length <= G_N_ELEMENTS(fp));
 
-	f = file_config_open_read_norename_chosen(
-			bogons_what, fp, G_N_ELEMENTS(fp), &idx);
+	f = file_config_open_read_norename_chosen(bogons_what, fp, length, &idx);
 
-	if (!f)
-	   return;
+	if (NULL == f)
+	   goto done;
 
 	filename = make_pathname(fpidx.dir, fpidx.name);
 	watcher_register(filename, bogons_changed, NULL);
@@ -208,6 +207,9 @@
 
 	bogons_load(f);
 	fclose(f);
+
+done:
+	HFREE_NULL(tmp);
 }
 
 /**

gtk-gnutella-0.97.tar.bz2/src/core/bogons.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/bogons.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/bsched.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/bsched.c Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: bsched.c 19142 2011-05-23 20:44:04Z rmanfredi $
- *
  * Copyright (c) 2002-2003, Raphael Manfredi
  *
  *----------------------------------------------------------------------
@@ -35,8 +33,6 @@
 
 #include "common.h"
 
-RCSID("$Id: bsched.c 19142 2011-05-23 20:44:04Z rmanfredi $")
-
 #include "bsched.h"
 #include "inet.h"
 #include "sockets.h"
@@ -359,7 +355,7 @@
 /**
  * Configure outband DHT traffic cross-stealing with Gnutella UDP
  */
-static void
+static G_GNUC_COLD void
 bsched_dht_cross_stealing(void)
 {
 	bsched_add_stealer(BSCHED_BWS_GOUT_UDP, BSCHED_BWS_DHT_OUT);
@@ -369,7 +365,7 @@
 /**
  * Allow cross-stealing of unused bandwidth between HTTP/gnet.
  */
-void
+G_GNUC_COLD void
 bsched_config_steal_http_gnet(void)
 {
 	GSList *iter;
@@ -419,7 +415,7 @@
 /**
  * Allow cross-stealing of unused bandwidth between TCP and UDP gnet only.
  */
-void
+G_GNUC_COLD void
 bsched_config_steal_gnet(void)
 {
 	GSList *iter;
@@ -440,7 +436,7 @@
  * This is called BEFORE settings_init(), bandwidth values are the default
  * values, not the configured ones.
  */
-void
+G_GNUC_COLD void
 bsched_early_init(void)
 {
 	bws_setBSCHED_BWS_OUT = bsched_make("out",
@@ -548,7 +544,7 @@
 /**
  * Configure schedules with actual limits set by the user.
  */
-static void
+static G_GNUC_COLD void
 bsched_correct_init(void)
 {
 	bsched_set_bandwidth(BSCHED_BWS_OUT, GNET_PROPERTY(bw_http_out));
@@ -566,7 +562,7 @@
 /**
  * Initialize global bandwidth schedulers.
  */
-void
+G_GNUC_COLD void
 bsched_init(void)
 {
 	bsched_correct_init();	/* Fix badnwidth using user-configured values */
@@ -588,7 +584,7 @@
 /**
  * Discard global bandwidth schedulers.
  */
-void
+G_GNUC_COLD void
 bsched_close(void)
 {
 	GSList *iter;
@@ -752,7 +748,7 @@
  * Disable all known bandwidth schedulers, so that any pending I/O can
  * go through as quickly as possible.
  */
-void
+G_GNUC_COLD void
 bsched_shutdown(void)
 {
 	GSList *sl;

gtk-gnutella-0.97.tar.bz2/src/core/bsched.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/bsched.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/clock.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/clock.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/clock.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/clock.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/ctl.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/ctl.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/ctl.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/ctl.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/dh.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/dh.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/dh.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/dh.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/dime.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/dime.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/dime.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/dime.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/dmesh.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/dmesh.c Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: dmesh.c 19325 2011-07-07 12:48:24Z rmanfredi $
- *
  * Copyright (c) 2002-2010, Raphael Manfredi
  *
  *----------------------------------------------------------------------
@@ -35,8 +33,6 @@
 
 #include "common.h"
 
-RCSID("$Id: dmesh.c 19325 2011-07-07 12:48:24Z rmanfredi $")
-
 #include "gtk-gnutella.h"
 
 #include "gnutella.h"
@@ -198,7 +194,7 @@
 /**
  * Initialize the download mesh.
  */
-void
+G_GNUC_COLD void
 dmesh_init(void)
 {
 	mesh = g_hash_table_new(sha1_hash, sha1_eq);
@@ -2269,7 +2265,7 @@
 
 	if (can_share_partials && GNET_PROPERTY(is_firewalled)) {
 		size_t url_len;
-		guid_t *servent_guid;
+		guid_t servent_guid;
 
 		gnet_prop_get_storage(PROP_SERVENT_GUID,
 			&servent_guid, sizeof servent_guid);
@@ -2281,7 +2277,7 @@
 		 */
 
 		url_len = dmesh_fwalt_string(url, sizeof url,
-			servent_guid, ipv4_unspecified, 0, NULL);
+			&servent_guid, ipv4_unspecified, 0, NULL);
 
 		g_assert(url_len < sizeof url);
 
@@ -3147,7 +3143,7 @@
  * Retrieve download mesh and add entries that have not expired yet.
  * The mesh is normally retrieved from ~/.gtk-gnutella/dmesh.
  */
-static void
+static G_GNUC_COLD void
 dmesh_retrieve(void)
 {
 	FILE *f;
@@ -3267,7 +3263,7 @@
  * Retrieve banned mesh and add entries that have not expired yet.
  * The mesh is normally retrieved from ~/.gtk-gnutella/dmesh_ban.
  */
-static void
+static G_GNUC_COLD void
 dmesh_ban_retrieve(void)
 {
 	FILE *in;
@@ -3357,7 +3353,7 @@
 /**
  * Called at servent shutdown time.
  */
-void
+G_GNUC_COLD void
 dmesh_close(void)
 {
 	GSList *banned = NULL;

gtk-gnutella-0.97.tar.bz2/src/core/dmesh.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/dmesh.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/downloads.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/downloads.c Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: downloads.c 19325 2011-07-07 12:48:24Z rmanfredi $
- *
  * Copyright (c) 2001-2011, Raphael Manfredi
  *
  *----------------------------------------------------------------------
@@ -117,8 +115,6 @@
 
 #include "lib/override.h"		/* Must be the last header included */
 
-RCSID("$Id: downloads.c 19325 2011-07-07 12:48:24Z rmanfredi $")
-
 #if defined(S_IROTH)
 #define DOWNLOAD_FILE_MODE (S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH) /* 0644 */
 #else
@@ -1277,7 +1273,7 @@
 /**
  * Initialize downloading data structures.
  */
-void
+G_GNUC_COLD void
 download_init(void)
 {
 	dl_by_host = g_hash_table_new(dl_key_hash, dl_key_eq);
@@ -1302,7 +1298,7 @@
 /**
  * Initialize downloading data structures.
  */
-void
+G_GNUC_COLD void
 download_restore_state(void)
 {
 	/*
@@ -2295,11 +2291,30 @@
 			 */
 
 			if (guid_eq(guid, GNET_PROPERTY(servent_guid))) {
-				gnet_stats_count_general(GNR_OWN_GUID_COLLISIONS, 1);
+				/*
+				 * Make sure the server address is not ours, otherwise we
+				 * don't count that as a GUID collision.
+				 */
 
-				if (GNET_PROPERTY(download_debug)) {
-					g_warning("host %s bears our GUID!",
-						host_addr_port_to_string(addr, port));
+				if (!is_my_address_and_port(addr, port)) {
+					gnet_stats_count_general(GNR_OWN_GUID_COLLISIONS, 1);
+
+					if (GNET_PROPERTY(download_debug)) {
+						g_warning("host %s bears our GUID!",
+							host_addr_port_to_string(addr, port));
+					}
+				} else {
+					/*
+					 * We're supposed to detect our IP:port earlier and avoid
+					 * attempting to download from ourselves.  When debugging,
+					 * trace the calling stack to see flaws in the logic.
+					 *		--RAM, 2011-07-19
+					 */
+
+					if (GNET_PROPERTY(download_debug)) {
+						g_carp("%s() called with our IP:port %s", G_STRFUNC,
+							host_addr_port_to_string(addr, port));
+					}
 				}
 
 				if (allocate)
@@ -5222,6 +5237,8 @@
 	}
 	if (d->thex) {
 		g_assert(d->flags & DL_F_THEX);
+		/* In case download_stop() is not called, untie association */
+		dualhash_remove_value(dl_thex, d->id);
 		thex_download_free(&d->thex);
 	}
 
@@ -15152,7 +15169,7 @@
 /**
  * Terminating processing, cleanup data structures.
  */
-void
+G_GNUC_COLD void
 download_close(void)
 {
 	gcu_download_gui_updates_freeze();

gtk-gnutella-0.97.tar.bz2/src/core/downloads.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/downloads.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/dq.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/dq.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/dq.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/dq.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/dump.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/dump.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/dump.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/dump.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/extensions.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/extensions.c Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: extensions.c 19299 2011-06-21 21:42:49Z rmanfredi $
- *
  * Copyright (c) 2002-2003, 2009, Raphael Manfredi
  *
  *----------------------------------------------------------------------
@@ -36,8 +34,6 @@
 
 #include "common.h"
 
-RCSID("$Id: extensions.c 19299 2011-06-21 21:42:49Z rmanfredi $")
-
 #include <zlib.h>
 
 #include "extensions.h"
@@ -247,7 +243,7 @@
  * @return the keyword token value upon success, EXT_T_UNKNOWN if not found.
  * If keyword was found, its static shared string is returned in `retkw'.
  */
-static ext_token_t
+static G_GNUC_HOT ext_token_t
 rw_screen(gboolean case_sensitive,
 	const struct rwtable *table, size_t size,
 	const char *word, const char **retkw)
@@ -279,7 +275,7 @@
 /**
  * Ensure the reserved-word table is lexically sorted.
  */
-static void
+static G_GNUC_COLD void
 rw_is_sorted(const char *name,
 	const struct rwtable *table, size_t size)
 {
@@ -416,7 +412,7 @@
 /**
  * Parses a GGEP block (can hold several extensions).
  */
-static int
+static G_GNUC_HOT int
 ext_ggep_parse(const char **retp, int len, extvec_t *exv, int exvcnt)
 {
 	const char *p = *retp;
@@ -1041,7 +1037,7 @@
  *
  * @return the number of filled entries.
  */
-static int
+static G_GNUC_HOT int
 ext_parse_buffer(const char *buf, size_t len, int flags,
 	extvec_t *exv, int exvcnt, char **endptr)
 {

gtk-gnutella-0.97.tar.bz2/src/core/extensions.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/extensions.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/features.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/features.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/features.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/features.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/file_object.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/file_object.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/file_object.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/file_object.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/fileinfo.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/fileinfo.c Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: fileinfo.c 19288 2011-06-19 12:19:22Z cbiere $
- *
  * Copyright (c) 2002-2003, Vidar Madsen
  * Copyright (c) 2004-2008, Christian Biere
  * Copyright (c) 2002-2010, Raphael Manfredi
@@ -42,8 +40,6 @@
 
 #include "common.h"
 
-RCSID("$Id: fileinfo.c 19288 2011-06-19 12:19:22Z cbiere $")
-
 #include <math.h>		/* For fabs() */
 
 #include "fileinfo.h"
@@ -153,7 +149,7 @@
 static GHashTable *fi_by_guid;
 
 static const char file_info_file = "fileinfo";
-static const char file_info_what = "the fileinfo database";
+static const char file_info_what = "fileinfo database";
 static gboolean fileinfo_dirty = FALSE;
 static gboolean can_swarm = FALSE;		/**< Set by file_info_retrieve() */
 static gboolean can_publish_partial_sha1;
@@ -2261,7 +2257,7 @@
 /**
  * Close and free all file_info structs in the list.
  */
-void
+G_GNUC_COLD void
 file_info_close(void)
 {
 	unsigned i;
@@ -2871,7 +2867,7 @@
 /**
  * Loads the fileinfo database from disk, and saves a copy in fileinfo.orig.
  */
-void
+G_GNUC_COLD void
 file_info_retrieve(void)
 {
 	FILE *f;
@@ -2899,7 +2895,7 @@
 	can_swarm = TRUE;			/* Allows file_info_try_to_swarm_with() */
 
 	file_path_set(&fp, settings_config_dir(), file_info_file);
-	f = file_config_open_read("fileinfo database", &fp, 1);
+	f = file_config_open_read(file_info_what, &fp, 1);
 	if (!f)
 		return;
 
@@ -7104,7 +7100,7 @@
 /**
  * Initialize fileinfo handling.
  */
-void
+G_GNUC_COLD void
 file_info_init(void)
 {

gtk-gnutella-0.97.tar.bz2/src/core/fileinfo.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/fileinfo.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/gdht.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/gdht.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/gdht.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/gdht.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/geo_ip.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/geo_ip.c Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: geo_ip.c 18596 2011-01-30 21:12:45Z rmanfredi $
- *
  * Copyright (c) 2004, Raphael Manfredi
  *
  *----------------------------------------------------------------------
@@ -35,8 +33,6 @@
 
 #include "common.h"
 
-RCSID("$Id: geo_ip.c 18596 2011-01-30 21:12:45Z rmanfredi $")
-
 #include "geo_ip.h"
 #include "settings.h"
 
@@ -113,7 +109,7 @@
  *
  * @return The amount of entries loaded.
  */
-static guint
+static G_GNUC_COLD guint
 gip_load(FILE *f)
 {
 	char line1024;
@@ -292,23 +288,27 @@
 	FILE *f;
 	int idx;
 	char *filename;
+	file_path_t fp4;
+	unsigned length = 0;
+	char *tmp;
+	
+	file_path_set(&fplength++, settings_config_dir(), gip_file);
+	
+	tmp = get_folder_path(PRIVLIB_PATH, NULL);
+	if (tmp != NULL)
+		file_path_set(&fplength++, tmp, gip_file);
+	
+	file_path_set(&fplength++, PRIVLIB_EXP, gip_file);
 #ifndef OFFICIAL_BUILD
-	static file_path_t fp3;
-#else
-	static file_path_t fp2;
+	file_path_set(&fplength++, PACKAGE_EXTRA_SOURCE_DIR, gip_file);
 #endif
 
-	file_path_set(&fp0, settings_config_dir(), gip_file);
-	file_path_set(&fp1, PRIVLIB_EXP, gip_file);
-#ifndef OFFICIAL_BUILD
-	file_path_set(&fp2, PACKAGE_EXTRA_SOURCE_DIR, gip_file);
-#endif
+	g_assert(length <= G_N_ELEMENTS(fp));
 
-	f = file_config_open_read_norename_chosen(
-			gip_what, fp, G_N_ELEMENTS(fp), &idx);
+	f = file_config_open_read_norename_chosen(gip_what, fp, length, &idx);
 
-	if (!f)
-	   return;
+	if (NULL == f)
+	   goto done;
 
 	filename = make_pathname(fpidx.dir, fpidx.name);
 	watcher_register(filename, gip_changed, NULL);
@@ -316,6 +316,9 @@
 
 	gip_load(f);
 	fclose(f);
+
+done:
+	HFREE_NULL(tmp);
 }
 
 /**

gtk-gnutella-0.97.tar.bz2/src/core/geo_ip.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/geo_ip.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/ggep.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/ggep.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/ggep.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/ggep.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/ggep_type.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/ggep_type.c Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: ggep_type.c 19299 2011-06-21 21:42:49Z rmanfredi $
- *
  * Copyright (c) 2002-2004, Raphael Manfredi
  *
  *----------------------------------------------------------------------
@@ -35,12 +33,11 @@
 
 #include "common.h"
 
-RCSID("$Id: ggep_type.c 19299 2011-06-21 21:42:49Z rmanfredi $")
-
 #include "ggep.h"
 #include "ggep_type.h"
 #include "hosts.h"				/* For struct gnutella_host */
 
+#include "lib/bstr.h"
 #include "lib/endian.h"
 #include "lib/gnet_host.h"
 #include "lib/misc.h"
@@ -48,6 +45,7 @@
 #include "lib/utf8.h"
 #include "lib/walloc.h"
 
+#include "if/gnet_property_priv.h"
 #include "if/core/search.h"
 
 #include "lib/override.h"		/* Must be the last header included */
@@ -125,6 +123,101 @@
 }
 
 /**
+ * The known OS names we encode into the GTKGV extension.
+ */
+static const char *gtkgv_osname = {
+	"Unknown OS",				/* 0 */
+	"UNIX",						/* 1 */
+	"BSD",						/* 2 */
+	"Linux",					/* 3 */
+	"FreeBSD",					/* 4 */
+	"NetBSD",					/* 5 */
+	"Windows",					/* 6 */
+	"Darwin",					/* 7 */
+};
+
+/**
+ * @return the OS name encoded into a GTKGV extension.
+ */
+static const char *
+ggept_gtkgv_osname(guint8 value)
+{
+	return value >= G_N_ELEMENTS(gtkgv_osname) ?
+		gtkgv_osname0 : gtkgv_osnamevalue;
+}
+
+/**
+ * Given a system name, look how it should be encoded in GTKGV.
+ */
+static guint8
+ggept_gtkgv_osname_encode(const char *sysname)
+{
+	guint8 result = 0;
+	size_t i;
+
+	/*
+	 * First some defaults in case we don't get an exact match.
+	 */
+
+	if (is_running_on_mingw())
+		result = 6;
+	else if (strstr(sysname, "BSD"))
+		result = 2;
+	else
+		result = 1;
+
+	/*
+	 * Now attempt a case-insensitive match to see whether we have
+	 * something more specific to use than the defaults.
+	 */
+
+	for (i = 3; i < G_N_ELEMENTS(gtkgv_osname); i++) {
+		if (0 == strcasecmp(sysname, gtkgv_osnamei)) {
+			result = i;
+			break;
+		}
+	}
+
+	if (GNET_PROPERTY(ggep_debug)) {
+		g_debug("GGEP encoded OS name \"%s\" in GTKGV will be %u",
+			sysname, result);
+	}
+
+	return result;
+}
+
+/**
+ * @return the value that should be advertised as the OS name.
+ */
+guint8
+ggept_gtkgv_osname_value(void)
+{
+	static guint8 result = -1;
+
+	/*
+	 * Computation only happens once.
+	 */
+
+	if (result >= G_N_ELEMENTS(gtkgv_osname)) {
+#ifdef HAS_UNAME
+		{
+			struct utsname un;
+
+			if (-1 != uname(&un)) {
+				result = ggept_gtkgv_osname_encode(un.sysname);
+			} else {
+				g_carp("uname() failed: %s", g_strerror(errno));
+			}
+		}
+#else
+		result = 0;
+#endif /* HAS_UNAME */
+	}
+
+	return result;
+}
+
+/**
  * Extract payload information from "GTKGV" into `info'.
  */
 ggept_status_t
@@ -132,6 +225,7 @@
 {
 	const char *p;
 	int tlen;
+	ggept_status_t status = GGEP_OK;
 
 	g_assert(exv->ext_type == EXT_GGEP);
 	g_assert(exv->ext_token == EXT_T_GGEP_GTKGV);
@@ -163,7 +257,68 @@
 	info->release = peek_be32(&p5);
 	info->build = peek_be32(&p9);
 
-	return GGEP_OK;
+	info->dirty = FALSE;
+	info->commit_len = 0;
+	ZERO(&info->commit);
+	info->osname = NULL;
+
+	if (info->version >= 1) {
+		bstr_t *bs;
+		guint8 flags;
+
+		bs = bstr_open(p, tlen, GNET_PROPERTY(ggep_debug) ? BSTR_F_ERROR : 0);
+		bstr_skip(bs, 13);
+
+		if (bstr_read_u8(bs, &flags)) {
+			guint8 aflags = flags;
+
+			/*
+			 * Swallow extra flags, if present (for now we expect only 1 byte).
+			 */
+
+			while ((aflags & GTKGV_F_CONT) && bstr_read_u8(bs, &aflags))
+				/* empty */;
+
+
+			info->dirty = booleanize(aflags & GTKGV_F_DIRTY);
+
+			/*
+			 * Process git commit SHA1, if present.
+			 */
+
+			if (aflags & GTKGV_F_GIT) {
+				if (
+					bstr_read_u8(bs, &info->commit_len) &&
+					info->commit_len != 0
+				) {
+					if (info->commit_len <= 2 * SHA1_RAW_SIZE) {
+						guint8 bytes = (info->commit_len + 1) / 2;
+						if (!bstr_read(bs, &info->commit, bytes)) {
+							status = GGEP_INVALID;
+						}
+					} else {
+						status = GGEP_INVALID;
+					}
+				}
+			}
+
+			/*
+			 * Process OS information is present and we got no error so far.
+			 */
+
+			if ((aflags & GTKGV_F_OS) && GGEP_OK == status) {
+				guint8 value;
+
+				if (bstr_read_u8(bs, &value)) {
+					info->osname = ggept_gtkgv_osname(value);
+				}
+			}

gtk-gnutella-0.97.tar.bz2/src/core/ggep_type.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/ggep_type.h Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: ggep_type.h 19299 2011-06-21 21:42:49Z rmanfredi $
- *
  * Copyright (c) 2002-2003, Raphael Manfredi
  *
  *----------------------------------------------------------------------
@@ -52,6 +50,15 @@
 } ggept_status_t;
 
 /*
+ * Flags for the GTKGV extension (version >= 1).
+ */
+
+#define GTKGV_F_CONT	(1U << 7)	/**< Continuation flag */
+#define GTKGV_F_GIT		(1U << 0)	/**< Has git commit identifier */
+#define GTKGV_F_DIRTY	(1U << 1)	/**< Had local changes at build time */
+#define GTKGV_F_OS		(1U << 2)	/**< Has OS code */
+
+/*
  * Public interface.
  */
 
@@ -79,8 +86,15 @@
 	guint8 revchar;
 	guint32 release;
 	guint32 build;
+	/* Introduced at version 1 */
+	const char *osname;		/**< Operating system name (static string) */
+	sha1_t commit;			/**< Commit version (may be partial) */
+	guint8 commit_len;		/**< Amount of valid nybbles */
+	unsigned dirty:1;
 };
 
+guint8 ggept_gtkgv_osname_value(void);
+
 ggept_status_t ggept_gtkgv_extract(const extvec_t *, struct ggep_gtkgv *info);
 ggept_status_t ggept_gtkgv1_extract(const extvec_t *, struct ggep_gtkgv1 *info);
 ggept_status_t ggept_hname_extract(const extvec_t *, char *buf, int len);

gtk-gnutella-0.97.tar.bz2/src/core/ghc.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/ghc.c Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: ghc.c 19142 2011-05-23 20:44:04Z rmanfredi $
- *
  * Copyright (c) 2010, Raphael Manfredi
  *
  *----------------------------------------------------------------------
@@ -38,8 +36,6 @@
 
 #include "common.h"
 
-RCSID("$Id: ghc.c 19142 2011-05-23 20:44:04Z rmanfredi $")
-
 #include "ghc.h"
 #include "http.h"
 #include "hcache.h"
@@ -200,6 +196,7 @@
 		HFREE_NULL(line);
 
 		if (error) {
+			ghc_ctx.ha = NULL;
 			ghc_connecting = FALSE;
 			return;
 		}
@@ -363,6 +360,7 @@
 			ctx->processed, ctx->processed == 1 ? "" : "s",
 			http_async_info(ghc_ctx.ha, NULL, NULL, NULL, NULL));
 
+	ghc_ctx.ha = NULL;
 	ghc_connecting = FALSE;
 }
 
@@ -383,6 +381,7 @@
 {
 	http_async_log_error_dbg(handle, type, v, "BOOT GHC",
 		GNET_PROPERTY(bootstrap_debug) > 1);
+	ghc_ctx.ha = NULL;
 	ghc_connecting = FALSE;
 }
 
@@ -444,7 +443,6 @@
 
 	if (!ghc_pick()) {
 		ghc_connecting = FALSE;
-		return;
 	}
 }
 
@@ -496,7 +494,7 @@
 /**
  * Initializations.
  */
-void
+G_GNUC_COLD void
 ghc_init(void)
 {
 	guint i;
@@ -514,7 +512,7 @@
 /**
  * Final cleanup.
  */
-void
+G_GNUC_COLD void
 ghc_close(void)
 {
 	if (ghc_connecting) {

gtk-gnutella-0.97.tar.bz2/src/core/ghc.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/ghc.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/gmsg.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/gmsg.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/gmsg.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/gmsg.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/gnet_stats.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/gnet_stats.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/gnet_stats.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/gnet_stats.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/gnutella.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/gnutella.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/guess.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/guess.c Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: guess.c 19332 2011-07-15 20:25:47Z rmanfredi $
- *
  * Copyright (c) 2011, Raphael Manfredi
  *
  *----------------------------------------------------------------------
@@ -76,8 +74,6 @@
 
 #include "common.h"
 
-RCSID("$Id: guess.c 19332 2011-07-15 20:25:47Z rmanfredi $")
-
 #include <math.h>		/* For pow() */
 
 #include "guess.h"
@@ -824,7 +820,7 @@
 /**
  * Reset old timeout indication.
  */
-static void
+static G_GNUC_HOT void
 guess_timeout_reset(const gnet_host_t *h, struct qkdata *qk)
 {
 	g_assert(h != NULL);
@@ -2898,12 +2894,18 @@
 		delta_time(tm_time(), qk->last_update) > GUESS_QK_LIFE
 	) {
 		struct guess_qk_context *ctx;
+		gboolean intro = settings_is_ultra();
 
 		WALLOC(ctx);
 		ctx->gid = gq->gid;
 		ctx->host = atom_host_get(host);
 
-		if (!guess_request_qk_full(gq, host, FALSE, guess_got_query_key, ctx)) {
+		/*
+		 * Contacting the host to request a query key is also an opportunity
+		 * to introduce ourselves as a GUESS server when running as ultra node.
+		 */
+
+		if (!guess_request_qk_full(gq, host, intro, guess_got_query_key, ctx)) {
 			guess_qk_context_free(ctx);
 			goto unqueried;
 		}
@@ -3513,6 +3515,7 @@
 	const char *buf, guint16 len)
 {
 	guint16 port;
+	gnet_host_t host;
 
 	/*
 	 * GUESS 0.2 defines the "GUE" payload for introduction as:
@@ -3526,12 +3529,21 @@
 
 	port = peek_le16(&buf1);
 	hcache_add_valid(HOST_GUESS, n->addr, port, "introduction ping");
+
+	/*
+	 * Since we got information that this host is an ultranode (or it would
+	 * not send an introduction ping), make sure we add it to the cache
+	 * of GUESS hosts and update its traffic information if already present.
+	 */
+
+	gnet_host_set(&host, n->addr, port);
+	guess_traffic_from(&host);
 }
 
 /**
  * Initialize the GUESS client layer.
  */
-void
+G_GNUC_COLD void
 guess_init(void)
 {
 	dbstore_kv_t kv = { sizeof(gnet_host_t), gnet_host_length,
@@ -3611,7 +3623,7 @@
 /*
  * Shutdown the GUESS client layer.
  */
-void
+G_GNUC_COLD void
 guess_close(void)
 {
 	if (NULL == db_qkdata)

gtk-gnutella-0.97.tar.bz2/src/core/guess.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/guess.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/guid.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/guid.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/guid.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/guid.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/hcache.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/hcache.c Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: hcache.c 19142 2011-05-23 20:44:04Z rmanfredi $
- *
  * Copyright (c) 2002-2003, Raphael Manfredi, Richard Eckart
  * Copyright (c) 2011, Raphael Manfredi
  *
@@ -53,8 +51,6 @@
 
 #include "common.h"
 
-RCSID("$Id: hcache.c 19142 2011-05-23 20:44:04Z rmanfredi $")
-
 #include "bogons.h"
 #include "hcache.h"
 #include "hostiles.h"
@@ -680,7 +676,7 @@
  * @return TRUE when IP/port passed sanity checks, regardless of whether it
  *         was added to the cache. (See above)
  */
-static gboolean
+static G_GNUC_HOT gboolean
 hcache_add_internal(hcache_type_t type, time_t added,
 	const host_addr_t addr, guint16 port, const char *what)
 {
@@ -1563,7 +1559,7 @@
 /**
  * Parse and load the hostcache file.
  */
-static void
+static G_GNUC_COLD void
 hcache_load_file(hostcache_t *hc, FILE *f)
 {
 	char buffer1024;
@@ -1787,7 +1783,7 @@
 /**
  * Initialize host caches.
  */
-void
+G_GNUC_COLD void
 hcache_init(void)
 {
 	ht_known_hosts = g_hash_table_new(gnet_host_hash, gnet_host_eq);
@@ -1855,7 +1851,7 @@
 /**
  * Load hostcache data from disk.
  */
-void
+G_GNUC_COLD void
 hcache_retrieve_all(void)
 {
 	hcache_retrieve(cachesHCACHE_FRESH_ANY, HOSTS_FILE);
@@ -1866,7 +1862,7 @@
 /**
  * Shutdown host caches.
  */
-void
+G_GNUC_COLD void
 hcache_shutdown(void)
 {
 	cq_periodic_remove(&hcache_save_ev);
@@ -1878,7 +1874,7 @@
 /**
  * Destroy all host caches.
  */
-void
+G_GNUC_COLD void
 hcache_close(void)
 {
 	static const hcache_type_t types = {

gtk-gnutella-0.97.tar.bz2/src/core/hcache.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/hcache.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/hostiles.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/hostiles.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/hostiles.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/hostiles.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/hosts.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/hosts.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/hosts.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/hosts.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/hsep.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/hsep.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/hsep.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/hsep.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/http.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/http.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/http.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/http.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/huge.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/huge.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/huge.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/huge.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/ignore.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/ignore.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/ignore.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/ignore.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/inet.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/inet.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/inet.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/inet.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/ioheader.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/ioheader.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/ioheader.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/ioheader.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/ipp_cache.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/ipp_cache.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/ipp_cache.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/ipp_cache.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/local_shell.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/local_shell.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/local_shell.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/local_shell.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/matching.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/matching.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/matching.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/matching.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/move.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/move.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/move.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/move.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/mq.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/mq.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/mq.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/mq.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/mq_tcp.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/mq_tcp.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/mq_tcp.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/mq_tcp.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/mq_udp.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/mq_udp.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/mq_udp.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/mq_udp.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/namesize.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/namesize.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/namesize.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/namesize.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/nodes.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/nodes.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/nodes.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/nodes.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/ntp.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/ntp.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/ntp.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/ntp.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/oob.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/oob.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/oob.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/oob.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/oob_proxy.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/oob_proxy.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/oob_proxy.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/oob_proxy.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/parq.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/parq.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/parq.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/parq.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/pcache.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/pcache.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/pcache.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/pcache.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/pdht.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/pdht.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/pdht.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/pdht.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/pproxy.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/pproxy.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/pproxy.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/pproxy.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/publisher.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/publisher.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/publisher.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/publisher.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/qhit.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/qhit.c Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: qhit.c 19310 2011-06-25 22:59:41Z rmanfredi $
- *
  * Copyright (c) 2004, Raphael Manfredi
  *
  *----------------------------------------------------------------------
@@ -35,8 +33,6 @@
 
 #include "common.h"
 
-RCSID("$Id: qhit.c 19310 2011-06-25 22:59:41Z rmanfredi $")
-
 #include "gtk-gnutella.h"
 
 #include "bsched.h"
@@ -52,6 +48,7 @@
 #include "ipp_cache.h"
 #include "uploads.h"	/* For count_uploads */
 #include "sockets.h"	/* For socket_listen_port() */
+#include "version.h"	/* For version_get_commit() and version_is_dirty() */
 
 #include "if/gnet_property_priv.h"
 #include "if/core/main.h"			/* For main_get_build() */
@@ -437,7 +434,12 @@
 		guint32 release;
 		guint32 date = release_date;
 		guint32 build;
-		guint8 version = 0;		/* This is GTKGV version 0 */
+		guint8 version = 1;		/* This is GTKGV version 1 */
+		guint8 osname;
+		guint8 flags;
+		guint8 commit_len;
+		size_t commit_bytes;
+		const sha1_t *commit;
 		gboolean ok;
 
 #ifdef GTA_PATCHLEVEL
@@ -446,9 +448,17 @@
 		patch = 0;
 #endif
 
+		flags = GTKGV_F_GIT | GTKGV_F_OS;
+		if (version_is_dirty())
+			flags |= GTKGV_F_DIRTY;
+
 		poke_be32(&release, date);
 		poke_be32(&build, main_get_build());
 
+		commit = version_get_commit(&commit_len);
+		commit_bytes = (1 + commit_len) / 2;
+		osname = ggept_gtkgv_osname_value();
+
 		ok =
 			ggep_stream_begin(&gs, GGEP_NAME(GTKGV), 0) &&
 			ggep_stream_write(&gs, &version, 1) &&
@@ -458,6 +468,10 @@
 			ggep_stream_write(&gs, &revchar, 1) &&
 			ggep_stream_write(&gs, &release, 4) &&
 			ggep_stream_write(&gs, &build, 4) &&
+			ggep_stream_write(&gs, &flags, 1) &&
+			ggep_stream_write(&gs, &commit_len, 1) &&
+			ggep_stream_write(&gs, commit, commit_bytes) &&
+			ggep_stream_write(&gs, &osname, 1) &&
 			ggep_stream_end(&gs);
 
 		if (!ok)

gtk-gnutella-0.97.tar.bz2/src/core/qhit.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/qhit.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/qrp.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/qrp.c Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: qrp.c 19319 2011-07-05 17:18:46Z rmanfredi $
- *
  * Copyright (c) 2002-2003, Raphael Manfredi
  *
  *----------------------------------------------------------------------
@@ -35,8 +33,6 @@
 
 #include "common.h"
 
-RCSID("$Id: qrp.c 19319 2011-07-05 17:18:46Z rmanfredi $")
-
 #ifdef I_MATH
 #include <math.h>
 #endif	/* I_MATH */
@@ -396,7 +392,7 @@
  * As a side effect, increment rt->set_count if the position ``i'' ends-up
  * being set after patching.
  */
-static inline void
+static inline G_GNUC_HOT ALWAYS_INLINE void
 qrt_patch_slot(struct routing_table *rt, guint i, guint8 v)
 {
 	guint b = 0x80U >> (i & 0x7);
@@ -3422,7 +3418,7 @@
 	 * advertised table size.
 	 */
 
-	if (qrcv->current_index >= rt->slots) {
+	if G_UNLIKELY(qrcv->current_index >= rt->slots) {
 		struct gnutella_node *n = qrcv->node;
 		g_warning("%s overflowed its QRP %d-bit patch of %s slots"
 			" (current_index=%d, slots=%d at %s message #%u/%u)",
@@ -3443,7 +3439,7 @@
 
 	last_patch_slot = (guint) qrcv->current_slot + len * slots_per_byte;
 
-	if (last_patch_slot > rt->client_slots) {
+	if G_UNLIKELY(last_patch_slot > rt->client_slots) {
 		struct gnutella_node *n = qrcv->node;
 		g_warning("%s overflowed its QRP %d-bit patch of "
 			"%s slots by extra %s at %s message #%u/%u",
@@ -3528,7 +3524,7 @@
  *
  * @returns TRUE on sucess, FALSE on error with the node being BYE-ed.
  */
-static gboolean
+static G_GNUC_HOT gboolean
 qrt_apply_patch4(struct qrt_receive *qrcv, const guchar *data, int len,
 	const struct qrp_patch *patch)
 {
@@ -3585,7 +3581,7 @@
  * name will be qrp_can_route_21.
  */
 #define CAN_ROUTE(bits) \
-static gboolean \
+static G_GNUC_HOT gboolean \
 qrp_can_route_##bits(const query_hashvec_t *qhv, \
 					 const struct routing_table *rt) \
  \
@@ -4557,7 +4553,7 @@
  * @returns list of nodes, a subset of the currently connected nodes.
  * Once used, the list of nodes can be freed with g_slist_free().
  */
-GSList *
+G_GNUC_HOT GSList *
 qrt_build_query_target(
 	query_hashvec_t *qhvec, int hops, int ttl, struct gnutella_node *source)
 {
@@ -4812,7 +4808,7 @@
 #define CHECK(x) g_assert((x))
 #endif /* TEST */
 
-void
+G_GNUC_COLD void
 test_hash(void)
 {
 	static const struct {

gtk-gnutella-0.97.tar.bz2/src/core/qrp.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/qrp.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/routing.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/routing.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/routing.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/routing.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/rudp.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/rudp.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/rudp.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/rudp.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/rx.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/rx.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/rx.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/rx.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/rx_chunk.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/rx_chunk.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/rx_chunk.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/rx_chunk.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/rx_inflate.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/rx_inflate.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/rx_inflate.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/rx_inflate.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/rx_link.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/rx_link.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/rx_link.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/rx_link.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/rxbuf.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/rxbuf.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/rxbuf.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/rxbuf.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/search.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/search.c Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: search.c 19325 2011-07-07 12:48:24Z rmanfredi $
- *
  * Copyright (c) 2001-2011, Raphael Manfredi
  *
  *----------------------------------------------------------------------
@@ -35,8 +33,6 @@
 
 #include "common.h"
 
-RCSID("$Id: search.c 19325 2011-07-07 12:48:24Z rmanfredi $")
-
 #include "search.h"
 #include "bogons.h"
 #include "ctl.h"
@@ -1854,18 +1850,22 @@
 
 					ret = ggept_gtkgv_extract(e, &vi);
 					if (ret == GGEP_OK) {
-						version_t ver;
+						version_ext_t ver;
 
 						ZERO(&ver);
-						ver.major = vi.major;
-						ver.minor = vi.minor;
-						ver.patchlevel = vi.patch;
-						ver.tag = vi.revchar;
-						ver.build = vi.build;
-						if (ver.tag)
-							ver.timestamp = vi.release;
+						ver.version.major = vi.major;
+						ver.version.minor = vi.minor;
+						ver.version.patchlevel = vi.patch;
+						ver.version.tag = vi.revchar;
+						ver.version.build = vi.build;
+						if (ver.version.tag)
+							ver.version.timestamp = vi.release;
+						ver.commit_len = vi.commit_len;
+						ver.commit = vi.commit;		/* Struct copy */
+						ver.osname = vi.osname;		/* Static string */
+						ver.dirty = vi.dirty;
 
-						rs->version = atom_str_get(version_str(&ver));
+						rs->version = atom_str_get(version_ext_str(&ver));
 					} else if (ret == GGEP_INVALID) {
 						search_log_bad_ggep(n, e, vendor);
 					}
@@ -2077,7 +2077,7 @@
  * @returns a structure describing the whole result set, or NULL if we
  * were unable to parse it properly.
  */
-static gnet_results_set_t *
+static G_GNUC_HOT gnet_results_set_t *
 get_results_set(gnutella_node_t *n, gboolean browse)
 {
 	gnet_results_set_t *rs;
@@ -4109,7 +4109,7 @@
  *** Public functions
  ***/
 
-void
+G_GNUC_COLD void
 search_init(void)
 {
 	search_by_muid = g_hash_table_new(guid_hash, guid_eq);
@@ -4124,7 +4124,7 @@
 	cq_periodic_main_add(SEARCH_GC_PERIOD * 1000, search_gc, NULL);
 }
 
-void
+G_GNUC_COLD void
 search_shutdown(void)
 {
 	while (sl_search_ctrl != NULL) {

gtk-gnutella-0.97.tar.bz2/src/core/search.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/search.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/settings.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/settings.c Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: settings.c 19266 2011-06-15 16:02:31Z rmanfredi $
- *
  * Copyright (c) 2001-2003, Raphael Manfredi, Richard Eckart
  *
  *----------------------------------------------------------------------
@@ -96,10 +94,7 @@
 
 #include "lib/override.h"		/* Must be the last header included */
 
-RCSID("$Id: settings.c 19266 2011-06-15 16:02:31Z rmanfredi $")
-
 static const char config_file = "config_gnet";
-static const char ul_stats_file = "upload_stats";
 
 static const mode_t IPC_DIR_MODE = S_IRUSR | S_IWUSR | S_IXUSR; /* 0700 */
 static const mode_t PID_FILE_MODE = S_IRUSR | S_IWUSR; /* 0600 */
@@ -229,7 +224,7 @@
  *			locked. Other errno values imply that the PID file could not
  *			be created.
  */
-static int
+static G_GNUC_COLD int
 ensure_unicity(const char *file, int *fd_ptr)
 {
 	gboolean locked = FALSE;
@@ -445,7 +440,7 @@
 /**
  * Initializes "config_dir", "home_dir", "crash_dir", etc...
  */
-void
+G_GNUC_COLD void
 settings_early_init(void)
 {
 	config_dir = h_strdup(getenv("GTK_GNUTELLA_DIR"));
@@ -634,7 +629,7 @@
 	gnet_prop_set_guint32_val(PROP_AVERAGE_SERVENT_DOWNTIME, average);
 }
 
-void
+G_GNUC_COLD void
 settings_init(void)
 {
 	guint64 memory = getphysmemsize();
@@ -720,13 +715,7 @@
 		}
 	}
 
-	{
-		char *path;
-
-		path = make_pathname(config_dir, ul_stats_file);
-		upload_stats_load_history(path);	/* Loads the upload statistics */
-		HFREE_NULL(path);
-	}
+	upload_stats_load_history();	/* Loads the upload statistics */
 
 
 	/* watch for filter_file defaults */
@@ -1107,7 +1096,7 @@
 /**
  * Called at exit time to flush the property files.
  */
-void
+G_GNUC_COLD void
 settings_shutdown(void)
 {
 	update_uptimes();
@@ -2921,7 +2910,7 @@
 
 static gboolean init_listGNET_PROPERTY_NUM;
 
-static void
+static G_GNUC_COLD void
 settings_callbacks_init(void)
 {
     unsigned n;

gtk-gnutella-0.97.tar.bz2/src/core/settings.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/settings.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/share.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/share.c Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: share.c 19305 2011-06-24 11:20:28Z rmanfredi $
- *
  * Copyright (c) 2001-2005, Raphael Manfredi
  * Copyright (c) 2000 Daniel Walker (dwalker@cats.ucsc.edu)
  *
@@ -38,8 +36,6 @@
 
 #include "common.h"
 
-RCSID("$Id: share.c 19305 2011-06-24 11:20:28Z rmanfredi $")
-
 #include "share.h"
 #include "extensions.h"
 #include "downloads.h"
@@ -82,6 +78,7 @@
 #include "lib/utf8.h"
 #include "lib/walloc.h"
 
+
 #include "lib/override.h"		/* Must be the last header included */
 
 #define SHARE_RECENT_THRESH		(2 * 7 * 24 * 60 * 60)	/* 2 weeks */
@@ -368,7 +365,7 @@
 	}
 	sf->flags &= ~SHARE_F_BASENAME;
 
-	/**
+	/*
 	 * The shared file might not be referenced by the current file_table
 	 * either because it hasn't been build yet or because of a rescan.
 	 */
@@ -394,6 +391,22 @@
 	sf->file_index = 0;
 	sf->sort_index = 0;
 	sf->flags &= ~SHARE_F_INDEXED;
+
+	/*
+	 * Shared file is no longer indexed so it no longer belongs to the
+	 * shared set and needs to be removed if it was referenced there.
+	 */
+
+	if (sf->sha1 != NULL) {
+		shared_file_t *current;
+		gpointer key;
+
+		key = deconstify_gpointer(sf->sha1);
+		current = g_tree_lookup(sha1_to_share, key);
+		if (current == sf) {
+			g_tree_remove(sha1_to_share, key);
+		}
+	}
 }
 
 /**
@@ -489,30 +502,32 @@
  * Initialize special file entry, returning shared_file_t structure if
  * the file exists, NULL otherwise.
  */
-static shared_file_t *
+static G_GNUC_COLD shared_file_t *
 share_special_load(const struct special_file *sp)
 {
 	FILE *f;
-	int idx;
-	shared_file_t *sf;
-
-#ifndef OFFICIAL_BUILD
-	file_path_t fp3;
-#else
-	file_path_t fp2;
-#endif
-
-	file_path_set(&fp0, settings_config_dir(), sp->file);
-	file_path_set(&fp1, PRIVLIB_EXP, sp->file);
+	int idx = 0;
+	char *tmp;
+	shared_file_t *sf = NULL;
+	file_path_t fp4;
+	unsigned length = 0;
+
+	tmp = get_folder_path(PRIVLIB_PATH, NULL);
+	if (tmp != NULL)
+		file_path_set(&fplength++, tmp, sp->file);
+
+	file_path_set(&fplength++, settings_config_dir(), sp->file);
+	file_path_set(&fplength++, PRIVLIB_EXP, sp->file);
 #ifndef OFFICIAL_BUILD
-	file_path_set(&fp2, PACKAGE_EXTRA_SOURCE_DIR, sp->file);
+	file_path_set(&fplength++, PACKAGE_EXTRA_SOURCE_DIR, sp->file);
 #endif
 
-	f = file_config_open_read_norename_chosen(
-			sp->what, fp, G_N_ELEMENTS(fp), &idx);
+	g_assert(length <= G_N_ELEMENTS(fp));
+	
+	f = file_config_open_read_norename_chosen(sp->what, fp, length, &idx);
 
-	if (!f)
-		return NULL;
+	if (NULL == f)
+		goto done;
 
 	/*
 	 * Create fake special file sharing structure, so that we can
@@ -535,6 +550,10 @@
 	}
 
 	fclose(f);
+
+done:
+	HFREE_NULL(tmp);
+
 	return sf;
 }
 
@@ -574,7 +593,7 @@
 /**
  * Initialize the special files we're sharing.
  */
-static void
+static G_GNUC_COLD void
 share_special_init(void)
 {
 	guint i;
@@ -2230,7 +2249,7 @@
 /**
  * Shutdown cleanup.
  */
-void
+G_GNUC_COLD void
 share_close(void)
 {
 	recursive_scan_free(&recursive_scan_context);
@@ -2844,7 +2863,7 @@
 	/*
 	 * We added a new partial file, we need to rebuild the QRP table.
 	 * Do that asynchronously in case we're called frequently from a loop,
-	 * for instane at startup or when many new files are downloaded.
+	 * for instance at startup or when many new files are downloaded.
 	 */
 
 	share_qrp_rebuild_if_needed();
@@ -2888,7 +2907,7 @@
 /**
  * Initialization of the sharing library.
  */
-void
+G_GNUC_COLD void
 share_init(void)
 {
 	size_t i;

gtk-gnutella-0.97.tar.bz2/src/core/share.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/share.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/soap.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/soap.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/soap.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/soap.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/sockets.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/sockets.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/sockets.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/sockets.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/spam.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/spam.c Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: spam.c 19142 2011-05-23 20:44:04Z rmanfredi $
- *
  * Copyright (c) 2006, Christian Biere
  * Copyright (c) 2004, Raphael Manfredi
  * Copyright (c) 2003, Markus Goetz
@@ -41,8 +39,6 @@
 
 #include "common.h"
 
-RCSID("$Id: spam.c 19142 2011-05-23 20:44:04Z rmanfredi $")
-
 #include "spam.h"
 #include "settings.h"
 #include "nodes.h"
@@ -235,7 +231,7 @@
  *
  * @returns the amount of entries loaded or -1 on failure.
  */
-static gulong
+static G_GNUC_COLD gulong
 spam_load(FILE *f)
 {
 	static const struct spam_item zero_item;
@@ -484,24 +480,32 @@
 static void
 spam_retrieve(void)
 {
-	static file_path_t fp3;
-	guint num_fp = G_N_ELEMENTS(fp) - 1;
+	file_path_t fp4;
 	FILE *f;
 	int idx;
-	
-	file_path_set(&fp0, settings_config_dir(), spam_text_file);
-	file_path_set(&fp1, PRIVLIB_EXP, spam_text_file);
+	char *tmp;
+	unsigned length = 0;
+
+	file_path_set(&fplength++, settings_config_dir(), spam_text_file);
+	file_path_set(&fplength++, PRIVLIB_EXP, spam_text_file);
 
 #ifndef OFFICIAL_BUILD
-	file_path_set(&fp2, PACKAGE_EXTRA_SOURCE_DIR, spam_text_file);
-	num_fp++;
+	file_path_set(&fplength++, PACKAGE_EXTRA_SOURCE_DIR, spam_text_file);
 #endif	/* !OFFICIAL_BUILD */
 
-	f = file_config_open_read_norename_chosen(spam_what, fp, num_fp, &idx);
-	if (f) {
+	tmp = get_folder_path(PRIVLIB_PATH, NULL);
+	if (tmp != NULL)
+		file_path_set(&fplength++, tmp, spam_text_file);
+
+	g_assert(length <= G_N_ELEMENTS(fp));
+
+	f = file_config_open_read_norename_chosen(spam_what, fp, length, &idx);
+	if (f != NULL) {
 		spam_retrieve_from_file(f, fpidx.dir, fpidx.name);
 		fclose(f);
 	}
+
+	HFREE_NULL(tmp);
 }
 
 /**

gtk-gnutella-0.97.tar.bz2/src/core/spam.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/spam.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/spam_sha1.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/spam_sha1.c Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: spam_sha1.c 19029 2011-05-03 22:02:29Z rmanfredi $
- *
  * Copyright (c) 2007, Christian Biere
  * Copyright (c) 2004, Raphael Manfredi
  * Copyright (c) 2003, Markus Goetz
@@ -41,8 +39,6 @@
 
 #include "common.h"
 
-RCSID("$Id: spam_sha1.c 19029 2011-05-03 22:02:29Z rmanfredi $")
-
 #include "spam.h"
 
 #include "lib/atoms.h"
@@ -87,7 +83,7 @@
 
 static struct sha1_lut sha1_lut;
 
-static inline int
+static inline G_GNUC_PURE int
 sha1_cmp_func(const void *a, const void *b)
 {
 	return sha1_cmp(a, b);
@@ -189,7 +185,7 @@
  *
  * @returns the amount of entries loaded or -1 on failure.
  */
-static gulong
+static G_GNUC_COLD gulong
 spam_sha1_load(FILE *f)
 {
 	char line1024;
@@ -310,24 +306,30 @@
 static void
 spam_sha1_retrieve(void)
 {
-	static file_path_t fp3;
-	guint num_fp = G_N_ELEMENTS(fp) - 1;
+	file_path_t fp4;
 	FILE *f;
 	int idx;
-	
-	file_path_set(&fp0, settings_config_dir(), spam_sha1_file);
-	file_path_set(&fp1, PRIVLIB_EXP, spam_sha1_file);
+	char *tmp;
+	unsigned length = 0;
+
+	file_path_set(&fplength++, settings_config_dir(), spam_sha1_file);
+	file_path_set(&fplength++, PRIVLIB_EXP, spam_sha1_file);
 
 #ifndef OFFICIAL_BUILD
-	file_path_set(&fp2, PACKAGE_EXTRA_SOURCE_DIR, spam_sha1_file);
-	num_fp++;
+	file_path_set(&fplength++, PACKAGE_EXTRA_SOURCE_DIR, spam_sha1_file);
 #endif	/* !OFFICIAL_BUILD */
 
-	f = file_config_open_read_norename_chosen(spam_sha1_what, fp, num_fp, &idx);
-	if (f) {
+	tmp = get_folder_path(PRIVLIB_PATH, NULL);
+	if (tmp != NULL)
+		file_path_set(&fplength++, tmp, spam_sha1_file);
+
+	f = file_config_open_read_norename_chosen(spam_sha1_what, fp, length, &idx);
+	if (f != NULL) {
 		spam_sha1_retrieve_from_file(f, fpidx.dir, fpidx.name);
 		fclose(f);
 	}
+
+	HFREE_NULL(tmp);
 }
 
 /**

gtk-gnutella-0.97.tar.bz2/src/core/spam_sha1.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/spam_sha1.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/special_upload.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/special_upload.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/sq.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/sq.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/sq.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/sq.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/thex_download.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/thex_download.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/thex_download.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/thex_download.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/thex_upload.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/thex_upload.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/thex_upload.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/thex_upload.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/tls_common.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/tls_common.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/tls_common.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/tls_common.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/token.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/token.c Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: token.c 19337 2011-07-18 07:18:09Z rmanfredi $
- *
  * Copyright (c) 2003, Raphael Manfredi
  *
  *----------------------------------------------------------------------
@@ -35,8 +33,6 @@
 
 #include "common.h"
 
-RCSID("$Id: token.c 19337 2011-07-18 07:18:09Z rmanfredi $")
-
 #include "token.h"
 #include "clock.h"
 #include "version.h"
@@ -339,6 +335,37 @@
 	"923d 4db5 5294 7c22 e6df f040 482d e7fd",
 };
 
+static const char *keys_097_1 = {
+	"39c5 71be a79f 3c39 2f30 7ae6 1eed c59d",
+	"f0f5 8eed c463 e3a0 58ea 7c8b 8624 b872",
+	"cfcd 4453 0a76 a4cf b31f 33ca b6fd c21a",
+	"445e d272 97af cf1a 0a24 0ed1 9b0f 2698",
+	"3dde 9e5c 1309 e6ea 6f7e 0663 7455 f809",
+	"1198 719c 180b 1b24 40ea b08f c87b 9130",
+	"91c5 675a 2308 bf82 8fc0 26cd 17b1 ae5f",
+	"c5b8 7e17 cfc5 fdf4 1b17 c71e 44ce 6cdf",
+	"b235 71f4 b93a f624 aee2 f369 dabd 333e",
+	"cfad b4c6 3cf1 e260 5e94 b745 a847 5b6f",
+	"9962 17de eb49 5d2f b6c8 b1d7 cd7c e709",
+	"d6db 29ea e272 2c88 c9aa 4ddf 7894 7450",
+	"df89 9db3 f8af 728a cd68 3ac1 1dc5 8954",
+	"b575 1dc5 0b95 db1a 121f b80a 6ab7 b274",
+	"d9ad 1f64 3705 a900 0d23 1314 51b8 c8a8",
+	"1f2c 6150 3d53 499f 8277 be84 6e88 de48",
+	"8e5f 13bb 66ce 575b f494 a7d4 35dd 7284",
+	"bbfd fdc9 ac8b 507f 190b 2b2a 33f9 ae99",
+	"dbdc 1eb8 e82a 18d1 7157 8531 587f 0132",
+	"ad13 6076 a759 b5da 0527 96cd 70c3 d893",
+	"78f2 bb4c ae51 e468 21d7 6f10 ad52 848c",
+	"50c3 abb7 60a3 658c 8352 26e2 de16 ee43",
+	"9910 aa85 e2c5 0d7e c587 86eb 6474 9a8c",
+	"7d6d 5c4b fd2f 509a af2b c7ee f060 0ed2",
+	"ed5e 6a5e 6574 bda8 246b 670b 7a0e bb81",
+	"45b2 3377 0a88 c54a d911 2d5e e4ba d513",
+	"89e6 b32f e2b6 0e65 3453 bbc7 fb5b b1e4",
+	"0c93 3ee1 f48f 3653 7a9c f338 8d2e 8868",
+};
+
 /**
  * Describes the keys to use depending on the version.
  */
@@ -393,6 +420,10 @@
 		{ 0, 97, 0, '\0', 0, 0, 1310940000 },		/* 2011-07-18 */
 		keys_097_0, G_N_ELEMENTS(keys_097_0),
 	},
+	{
+		{ 0, 97, 1, '\0', 0, 0, 1315692000 },		/* 2011-09-11 */
+		keys_097_1, G_N_ELEMENTS(keys_097_1),
+	},
 };
 
 /**

gtk-gnutella-0.97.tar.bz2/src/core/token.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/token.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/topless.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/topless.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/topless.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/topless.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/tsync.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/tsync.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/tsync.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/tsync.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/tth_cache.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/tth_cache.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/tth_cache.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/tth_cache.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/tx.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/tx.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/tx.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/tx.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/tx_chunk.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/tx_chunk.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/tx_chunk.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/tx_chunk.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/tx_deflate.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/tx_deflate.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/tx_deflate.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/tx_deflate.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/tx_dgram.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/tx_dgram.c Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: tx_dgram.c 19142 2011-05-23 20:44:04Z rmanfredi $
- *
  * Copyright (c) 2002-2003, Raphael Manfredi
  *
  *----------------------------------------------------------------------
@@ -37,8 +35,6 @@
 
 #include "common.h"
 
-RCSID("$Id: tx_dgram.c 19142 2011-05-23 20:44:04Z rmanfredi $")
-
 #include "bsched.h"
 #include "sockets.h"
 #include "tx.h"
@@ -140,7 +136,8 @@
 }
 
 static inline int
-tx_dgram_write_error(txdrv_t *tx, const gnet_host_t *to, const char *func)
+tx_dgram_write_error(txdrv_t *tx, const gnet_host_t *to, size_t len,
+	const char *func)
 {
 	if (is_temporary_error(errno) || ENOBUFS == errno)
 		return 0;
@@ -154,9 +151,9 @@
 	case EINPROGRESS:		/* Weird, but seen it -- RAM, 07/10/2003 */
 	{
 		const struct attr *attr = tx->opaque;
-		g_warning("%s(fd=%d) failed with weird errno = %d (%s), "
-			"assuming EAGAIN", func, attr->wio->fd(attr->wio), errno,
-			g_strerror(errno));
+		g_warning("%s(fd=%d, len=%lu) failed with weird errno = %d (%s), "
+			"assuming EAGAIN", func, attr->wio->fd(attr->wio),
+			(unsigned long) len, errno, g_strerror(errno));
 	}
 		return 0;
 	case EPIPE:
@@ -166,6 +163,7 @@
 #ifdef EDQUOT
 	case EDQUOT:
 #endif /* EDQUOT */
+	case EMSGSIZE:			/* Message too large */
 	case EFBIG:
 	case EIO:
 	case EADDRNOTAVAIL:
@@ -185,15 +183,16 @@
 		/*
 		 * Don't set TX_ERROR here, we don't care about lost packets.
 		 */
-		g_warning("UDP write to %s failed: %s",
-			gnet_host_to_string(to), g_strerror(errno));
+		g_carp("UDP write of %lu bytes to %s failed: %s",
+			(unsigned long) len, gnet_host_to_string(to), g_strerror(errno));
 		return -1;
 	default:
 		{
 			int terr = errno;
 			tx->flags |= TX_ERROR;				/* This should be fatal! */
-			g_error("%s: UDP write to %s failed with unexpected errno: %d (%s)",
-				func, gnet_host_to_string(to),
+			g_error("%s: UDP write of %lu bytes to %s failed "
+				"with unexpected errno: %d (%s)",
+				func, (unsigned long) len, gnet_host_to_string(to),
 				terr, g_strerror(terr));
 		}
 	}
@@ -220,7 +219,7 @@
 		r = -1;
 	}
 	if ((ssize_t) -1 == r)
-		return tx_dgram_write_error(tx, to, "tx_dgram_sendto");
+		return tx_dgram_write_error(tx, to, len, "tx_dgram_sendto");
 
 	if (attr->cb->add_tx_written != NULL)
 		attr->cb->add_tx_written(tx->owner, r);

gtk-gnutella-0.97.tar.bz2/src/core/tx_dgram.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/tx_dgram.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/tx_link.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/tx_link.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/tx_link.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/tx_link.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/udp.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/udp.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/udp.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/udp.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/uhc.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/uhc.c Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: uhc.c 19334 2011-07-17 18:36:40Z rmanfredi $
- *
  * Copyright (c) 2004, Raphael Manfredi
  *
  *----------------------------------------------------------------------
@@ -35,8 +33,6 @@
 
 #include "common.h"
 
-RCSID("$Id: uhc.c 19334 2011-07-17 18:36:40Z rmanfredi $")
-
 #include "gnutella.h"
 #include "guid.h"
 #include "hcache.h"
@@ -101,6 +97,7 @@
 	{ "localhost:6346" },
 #else	/* !USE_LOCAL_UHC */
 	{ "yin.cloud.bishopston.net:33558" },
+	{ "uhc.gtk-gnutella.nl:15749" },
 #endif	/* USE_LOCAL_UHC */
 };
 
@@ -108,6 +105,7 @@
 
 static void uhc_host_resolved(const host_addr_t *addr, size_t n,
 				gpointer uu_udata);
+static void uhc_send_ping(void);
 
 /**
  * Parse hostname:port and return the hostname and port parts.
@@ -215,6 +213,9 @@
 		return;
 	}
 
+	if (GNET_PROPERTY(bootstrap_debug) > 1)
+			g_debug("Adding UHC %s", host);
+			
 	if (random_value(100) < 50) {
 		hash_list_append(uhc_list, uhc);
 	} else {
@@ -309,6 +310,8 @@
 static void
 uhc_try_random(void)
 {
+	host_addr_t addr;
+
 	g_assert(uhc_connecting);
 	g_assert(uhc_ctx.timeout_ev == NULL);
 
@@ -322,8 +325,17 @@
 	 * we're protected by the `attempts' counter.
 	 */
 
-	(void) adns_resolve(uhc_ctx.host, settings_dns_net(),
-				uhc_host_resolved, NULL);
+	if (string_to_host_addr(uhc_ctx.host, NULL, &addr)) {
+		uhc_ctx.addr = addr;
+		
+		if (GNET_PROPERTY(bootstrap_debug))
+			g_debug("BOOT UDP host cache \"%s\"", uhc_ctx.host);
+
+		uhc_send_ping();
+	} else {
+		(void) adns_resolve(uhc_ctx.host, settings_dns_net(),
+					uhc_host_resolved, NULL);
+	}
 }
 
 /**
@@ -408,7 +420,37 @@
 		return;
 	}
 
-	uhc_ctx.addr = addrsrandom_u32() % n;
+	if (n > 1)
+	{
+		size_t i;
+		/* Current uhc was moved to tail by uhc_get_next */
+		struct uhc *uhc = hash_list_tail(uhc_list);
+		
+		/*
+		 * UHC resolved to multiple endpoints. Could be roundrobbin or
+		 * IPv4 and IPv6 address. Adding them as seperate entries if the IPv6 is
+		 * unreachable we might be retrying the IPv6 over and over again, there
+		 * is no garantee that the random_u32() above will eventually pick
+		 * the IPv4 address.
+		 * 	-- JA 24/7/2011
+		 */
+		for(i = 0; i < n; i++) {	
+			const char *host = host_addr_port_to_string(addrsi, uhc_ctx.port);
+			g_debug("BOOT UDP host cache \"%s\" resolved to %s",
+				uhc_ctx.host, host);
+			
+			uhc_list_add(host);
+		}
+		
+		hash_list_remove(uhc_list, uhc);
+		
+		uhc_try_random();
+		
+		return;
+	}
+	
+	uhc_ctx.addr = addrs0;
+
 	
 	if (GNET_PROPERTY(bootstrap_debug))
 		g_debug("BOOT UDP host cache \"%s\" resolved to %s",
@@ -544,7 +586,7 @@
 /**
  * Initializations.
  */
-void
+G_GNUC_COLD void
 uhc_init(void)
 {
 	guint i;
@@ -574,7 +616,7 @@
 /**
  * Cleanup during process termination.
  */
-void
+G_GNUC_COLD void
 uhc_close(void)
 {
 	cq_cancel(&uhc_ctx.timeout_ev);

gtk-gnutella-0.97.tar.bz2/src/core/uhc.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/uhc.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/upload_stats.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/upload_stats.c Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: upload_stats.c 19142 2011-05-23 20:44:04Z rmanfredi $
- *
  * Copyright (c) 2001-2003, Raphael Manfredi
  * Copyright (c) 2002, Michael Tesch
  *
@@ -54,10 +52,9 @@
 
 #include "common.h"
 
-RCSID("$Id: upload_stats.c 19142 2011-05-23 20:44:04Z rmanfredi $")
-
 #include "upload_stats.h"
 #include "share.h"
+#include "settings.h"
 
 #include "if/bridge/c2ui.h"
 
@@ -77,8 +74,10 @@
 
 #include "lib/override.h"		/* Must be the last header included */
 
+static const char ul_stats_file = "upload_stats";
+static const char ul_stats_what = "upload statistics";
+
 static gboolean dirty = FALSE;
-static char *stats_file;
 static hash_list_t *upload_stats_list;
 static GHashTable *upload_stats_by_sha1;
 
@@ -204,19 +203,20 @@
 	gcu_upload_stats_gui_add(s);
 }
 
-void
-upload_stats_load_history(const char *ul_history_file_name)
+G_GNUC_COLD void
+upload_stats_load_history(void)
 {
 	FILE *upload_stats_file;
+	file_path_t fp;
 	char lineFILENAME_MAX + 64;
 	guint lineno = 0;
 
 	gcu_upload_stats_gui_freeze();
 	
-	stats_file = g_strdup(ul_history_file_name);
+	file_path_set(&fp, settings_config_dir(), ul_stats_file);
 
 	/* open file for reading */
-	upload_stats_file = file_fopen_missing(ul_history_file_name, "r");
+	upload_stats_file = file_config_open_read(ul_stats_what, &fp, 1);
 	if (upload_stats_file == NULL)
 		goto done;
 
@@ -376,25 +376,21 @@
  * Save upload statistics to file.
  */
 static void
-upload_stats_dump_history(const char *ul_history_file_name)
+upload_stats_dump_history(void)
 {
 	FILE *out;
-	time_t now = tm_time();
-
-	g_return_if_fail(ul_history_file_name);
+	file_path_t fp;
 
 	/* open file for writing */
-	out = file_fopen(ul_history_file_name, "w");
-	if (NULL == out) {
+	file_path_set(&fp, settings_config_dir(), ul_stats_file);
+	out = file_config_open_write(ul_stats_what, &fp);
+
+	if (NULL == out)
 		return;
-	}
 
-	fprintf(out,
-		"# THIS FILE IS AUTOMATICALLY GENERATED -- DO NOT EDIT\n"
-		"#\n"
-		"# Upload statistics saved on %s\n"
-		"#\n"
-		"\n"
+	file_config_preamble(out, "Upload statistics");
+
+	fputs(
 		"#\n"
 		"# Format is:\n"
 		"#    File basename <TAB> size <TAB> attempts <TAB> completed\n"
@@ -403,7 +399,8 @@
 		"#        <TAB> SHA1 (\"*\" if unknown)\n"
 		"#\n"
 		"\n",
-		timestamp_to_string(now));
+		out
+	);
 
 	/*
 	 * Don't check this sooner so that the file is cleared, if the user
@@ -414,8 +411,8 @@
 		hash_list_foreach(upload_stats_list, upload_stats_dump_item, out);
 	}
 
-	/* close file */
-	fclose(out);
+	file_config_close(out, &fp);
+	dirty = FALSE;
 }
 
 /**
@@ -428,12 +425,7 @@
 	if (!dirty)
 		return;
 
-	dirty = FALSE;
-
-	if (NULL != stats_file)
-		upload_stats_dump_history(stats_file);
-	else
-		g_warning("can't save upload statistics: no file name recorded");
+	upload_stats_dump_history();
 }
 
 /**
@@ -600,7 +592,7 @@
 /**
  * Clear all the upload stats data structure.
  */
-static void
+static G_GNUC_COLD void
 upload_stats_free_all(void)
 {
 	if (upload_stats_list) {
@@ -629,9 +621,7 @@
 {
 	gcu_upload_stats_gui_clear_all();
 	upload_stats_free_all();
-	if (stats_file) {
-		upload_stats_dump_history(stats_file);
-	}
+	upload_stats_dump_history();
 }
 
 /**
@@ -640,9 +630,8 @@
 void
 upload_stats_close(void)
 {
-	upload_stats_dump_history(stats_file);
+	upload_stats_dump_history();
 	upload_stats_free_all();
-	G_FREE_NULL(stats_file);
 }
 
 /* vi: set ts=4 sw=4 cindent: */

gtk-gnutella-0.97.tar.bz2/src/core/upload_stats.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/upload_stats.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/uploads.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/uploads.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/uploads.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/uploads.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/urpc.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/urpc.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/urpc.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/urpc.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/verify.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/verify.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/verify.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/verify.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/verify_sha1.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/verify_sha1.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/verify_sha1.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/verify_sha1.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/verify_tth.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/verify_tth.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/verify_tth.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/verify_tth.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/version.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/version.c Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: version.c 17618 2010-10-31 19:24:38Z rmanfredi $
- *
  * Copyright (c) 2002-2003, Raphael Manfredi
  *
  *----------------------------------------------------------------------
@@ -35,8 +33,6 @@
 
 #include "common.h"
 
-RCSID("$Id: version.c 17618 2010-10-31 19:24:38Z rmanfredi $")
-
 #include "gtk-gnutella.h"
 
 #include "version.h"
@@ -50,8 +46,10 @@
 
 #include "lib/atoms.h"
 #include "lib/ascii.h"
+#include "lib/base16.h"
 #include "lib/getdate.h"
 #include "lib/glib-missing.h"
+#include "lib/misc.h"
 #include "lib/parse.h"
 #include "lib/tm.h"
 #include "lib/timestamp.h"
@@ -64,6 +62,7 @@
 const char *version_short_string = NULL;
 
 static version_t our_version;
+static version_ext_t our_ext_version;
 static version_t last_rel_version;
 static version_t last_dev_version;
 static guint8 version_code;
@@ -87,6 +86,27 @@
 }
 
 /**
+ * Is our version indicating dirtyness?
+ */
+gboolean
+version_is_dirty(void)
+{
+	return our_ext_version.dirty;
+}
+
+/**
+ * Get commit string and commit length (amount of valid nybbles).
+ */
+const struct sha1 *
+version_get_commit(guint8 *len)
+{
+	if (len != NULL)
+		*len = our_ext_version.commit_len;
+
+	return &our_ext_version.commit;
+}
+
+/**
  * Dump original version string and decompiled form to stdout.
  */
 static void
@@ -99,6 +119,68 @@
 }
 
 /**
+ * @return a user-friendly description of the extended version.
+ * NB: returns pointer to static data.
+ */
+const char *version_ext_str(const version_ext_t *vext)
+{
+	static char str120;
+	const version_t *ver = &vext->version;
+	int rw;
+	gboolean has_extra = FALSE;
+	gboolean need_closing = FALSE;
+
+	rw = gm_snprintf(str, sizeof(str), "%u.%u", ver->major, ver->minor);
+
+	if (ver->patchlevel)
+		rw += gm_snprintf(&strrw, sizeof(str)-rw, ".%u", ver->patchlevel);
+
+	if (ver->tag) {
+		rw += gm_snprintf(&strrw, sizeof(str)-rw, "%c", ver->tag);
+		if (ver->taglevel)
+			rw += gm_snprintf(&strrw, sizeof(str)-rw, "%u", ver->taglevel);
+	}
+
+	if (ver->build)
+		rw += gm_snprintf(&strrw, sizeof(str)-rw, "-%u", ver->build);
+
+	if (vext->commit_len != 0) {
+		static char digestSHA1_BASE16_SIZE + 1;
+		size_t offset = MIN(vext->commit_len, SHA1_BASE16_SIZE);
+
+		sha1_to_base16_buf(&vext->commit, digest, sizeof digest);
+		digestoffset = '\0';
+		rw += gm_snprintf(&strrw, sizeof(str)-rw, "-g%s", digest);
+	}
+
+	if (vext->dirty)
+		rw += gm_snprintf(&strrw, sizeof(str)-rw, "-dirty");
+
+	if (ver->timestamp || vext->osname != NULL) {
+		rw += gm_snprintf(&strrw, sizeof(str)-rw, " (");
+		need_closing = TRUE;
+	}
+
+	if (ver->timestamp) {
+		struct tm *tmp = localtime(&ver->timestamp);
+		rw += gm_snprintf(&strrw, sizeof(str)-rw, "%d-%02d-%02d",
+			tmp->tm_year + 1900, tmp->tm_mon + 1, tmp->tm_mday);
+		has_extra = TRUE;
+	}
+
+	if (vext->osname != NULL) {
+		if (has_extra)
+			rw += gm_snprintf(&strrw, sizeof(str)-rw, "; ");
+		rw += gm_snprintf(&strrw, sizeof(str)-rw, "%s", vext->osname);
+	}
+
+	if (need_closing)
+		rw += gm_snprintf(&strrw, sizeof(str)-rw, ")");
+
+	return str;
+}
+
+/**
  * @return a user-friendly description of the version.
  * NB: returns pointer to static data.
  */
@@ -182,16 +264,103 @@
 	}
 }
 
+/**
+ * Parse extended build information (git's commit string + dirtyness)
+ * from a version string, starting at the first byte after the build number.
+ *
+ * A typical extended build information would look like:
+ *
+ *		-g5c02b-dirty
+ *
+ * The hexadecimal string after "-g" points to the leading git commit ID.
+ * The "-dirty" indication is present when the binary was built with
+ * uncommitted changes.
+ *
+ * @returns TRUE if we parsed the extended build information properly, FALSE
+ * if we were not facing a proper extension.
+ */
+static gboolean
+version_ext_parse(const char *str, version_ext_t *vext)
+{
+	const char *v;
+	const char *e;
+	size_t commit_len;
+	char commitSHA1_BASE16_SIZE + 1;
+
+	v = is_strprefix(str, "-g");
+	if (NULL == v) {
+		/*
+		 * There may not be any git tag, but there may be a dirty indication.
+		 */
+
+		e = is_strprefix(str, "dirty");
+		if (e != NULL) {
+			vext->dirty = TRUE;
+			return TRUE;
+		} else if (' ' == *str || '\0' == *str) {
+			return TRUE;
+		}
+		return FALSE;
+	}
+
+	/*
+	 * Compute the length of the hexadecimal string, up to the next '-' or
+	 * the next ' ' or the end of the string.
+	 */
+
+	e = strchr(v, ' ');
+	if (e != NULL) {
+		const char *d;
+		d = strchr(v, '-');
+		if (NULL == d || d > e) {
+			commit_len = e - v;		/* '-' before ' ' or no '-' at all */
+		} else {
+			commit_len = d - v;		/* '-' after ' ' */
+			e = d;
+		}
+	} else {
+		e = strchr(v, '-');
+		if (e != NULL) {
+			commit_len = e - v;
+		} else {
+			commit_len = strlen(v);
+		}
+	}
+
+	if (commit_len > SHA1_BASE16_SIZE)

gtk-gnutella-0.97.tar.bz2/src/core/version.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/version.h Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: version.h 17029 2009-10-04 15:41:06Z rmanfredi $
- *
  * Copyright (c) 2002-2003, Raphael Manfredi
  *
  *----------------------------------------------------------------------
@@ -54,6 +52,17 @@
 	time_t timestamp;
 } version_t;
 
+/**
+ * An extended decompiled version descriptor.
+ */
+typedef struct version_ext {
+	version_t version;			/**< Basic version information */
+	guint8 commit_len;			/**< Amount of valid nybbles in commit */
+	sha1_t commit;				/**< Git's commit SHA1 (partial) */
+	const char *osname;			/**< Static string */
+	unsigned dirty:1;
+} version_ext_t;
+
 /*
  * Banning periods for our versions.
  */
@@ -77,12 +86,15 @@
 gboolean version_fill(const char *version, version_t *vs);
 
 const char *version_str(const version_t *ver);
+const char *version_ext_str(const version_ext_t *vext);
 
 extern const char *version_string;
 extern const char *version_short_string;
 
 const char *version_build_string(void);
-guint8 version_get_code(void);
+guint8 version_get_code(void) G_GNUC_PURE;
+gboolean version_is_dirty(void) G_GNUC_PURE;
+const struct sha1 *version_get_commit(guint8 *len);
 
 #endif	/* _core_version_h_ */

gtk-gnutella-0.97.tar.bz2/src/core/vmsg.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/vmsg.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/vmsg.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/vmsg.h Changed

gtk-gnutella-0.97.tar.bz2/src/core/whitelist.c -> gtk-gnutella-0.97.1.tar.bz2/src/core/whitelist.c Changed

gtk-gnutella-0.97.tar.bz2/src/core/whitelist.h -> gtk-gnutella-0.97.1.tar.bz2/src/core/whitelist.h Changed

gtk-gnutella-0.97.tar.bz2/src/dht/acct.c -> gtk-gnutella-0.97.1.tar.bz2/src/dht/acct.c Changed

gtk-gnutella-0.97.tar.bz2/src/dht/acct.h -> gtk-gnutella-0.97.1.tar.bz2/src/dht/acct.h Changed

gtk-gnutella-0.97.tar.bz2/src/dht/keys.c -> gtk-gnutella-0.97.1.tar.bz2/src/dht/keys.c Changed

gtk-gnutella-0.97.tar.bz2/src/dht/keys.h -> gtk-gnutella-0.97.1.tar.bz2/src/dht/keys.h Changed

gtk-gnutella-0.97.tar.bz2/src/dht/kmsg.c -> gtk-gnutella-0.97.1.tar.bz2/src/dht/kmsg.c Changed

gtk-gnutella-0.97.tar.bz2/src/dht/kmsg.h -> gtk-gnutella-0.97.1.tar.bz2/src/dht/kmsg.h Changed

gtk-gnutella-0.97.tar.bz2/src/dht/knode.c -> gtk-gnutella-0.97.1.tar.bz2/src/dht/knode.c Changed

gtk-gnutella-0.97.tar.bz2/src/dht/knode.h -> gtk-gnutella-0.97.1.tar.bz2/src/dht/knode.h Changed

gtk-gnutella-0.97.tar.bz2/src/dht/kuid.c -> gtk-gnutella-0.97.1.tar.bz2/src/dht/kuid.c Changed

gtk-gnutella-0.97.tar.bz2/src/dht/kuid.h -> gtk-gnutella-0.97.1.tar.bz2/src/dht/kuid.h Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: kuid.h 17733 2010-11-13 12:46:53Z rmanfredi $
- *
  * Copyright (c) 2006-2009, Raphael Manfredi
  *
  *----------------------------------------------------------------------
@@ -44,12 +42,14 @@
 
 void kuid_random_fill(kuid_t *kuid);
 void kuid_from_buf(kuid_t *dest, const gchar *id);
-gboolean kuid_is_blank(const kuid_t *kuid);
-int kuid_cmp3(const kuid_t *target, const kuid_t *kuid1, const kuid_t *kuid2);
-int kuid_cmp(const kuid_t *kuid1, const kuid_t *kuid2);
+gboolean kuid_is_blank(const kuid_t *kuid) G_GNUC_PURE;
+int kuid_cmp3(const kuid_t *target, const kuid_t *kuid1, const kuid_t *kuid2)
+	G_GNUC_PURE;
+int kuid_cmp(const kuid_t *kuid1, const kuid_t *kuid2) G_GNUC_PURE;
 void kuid_xor_distance(kuid_t *res, const kuid_t *k1, const kuid_t *k2);
-gboolean kuid_match_nth(const kuid_t *k1, const kuid_t *k2, int bits);
-size_t kuid_common_prefix(const kuid_t *k1, const kuid_t *k2);
+gboolean kuid_match_nth(const kuid_t *k1, const kuid_t *k2, int bits)
+	G_GNUC_PURE;
+size_t kuid_common_prefix(const kuid_t *k1, const kuid_t *k2) G_GNUC_PURE;
 void kuid_random_within(kuid_t *dest, const kuid_t *prefix, int bits);
 void kuid_flip_nth_leading_bit(kuid_t *res, int n);

gtk-gnutella-0.97.tar.bz2/src/dht/lookup.c -> gtk-gnutella-0.97.1.tar.bz2/src/dht/lookup.c Changed

gtk-gnutella-0.97.tar.bz2/src/dht/lookup.h -> gtk-gnutella-0.97.1.tar.bz2/src/dht/lookup.h Changed

gtk-gnutella-0.97.tar.bz2/src/dht/publish.c -> gtk-gnutella-0.97.1.tar.bz2/src/dht/publish.c Changed

gtk-gnutella-0.97.tar.bz2/src/dht/publish.h -> gtk-gnutella-0.97.1.tar.bz2/src/dht/publish.h Changed

gtk-gnutella-0.97.tar.bz2/src/dht/revent.c -> gtk-gnutella-0.97.1.tar.bz2/src/dht/revent.c Changed

gtk-gnutella-0.97.tar.bz2/src/dht/revent.h -> gtk-gnutella-0.97.1.tar.bz2/src/dht/revent.h Changed

gtk-gnutella-0.97.tar.bz2/src/dht/roots.c -> gtk-gnutella-0.97.1.tar.bz2/src/dht/roots.c Changed

gtk-gnutella-0.97.tar.bz2/src/dht/roots.h -> gtk-gnutella-0.97.1.tar.bz2/src/dht/roots.h Changed

gtk-gnutella-0.97.tar.bz2/src/dht/routing.c -> gtk-gnutella-0.97.1.tar.bz2/src/dht/routing.c Changed

gtk-gnutella-0.97.tar.bz2/src/dht/routing.h -> gtk-gnutella-0.97.1.tar.bz2/src/dht/routing.h Changed

gtk-gnutella-0.97.tar.bz2/src/dht/rpc.c -> gtk-gnutella-0.97.1.tar.bz2/src/dht/rpc.c Changed

gtk-gnutella-0.97.tar.bz2/src/dht/rpc.h -> gtk-gnutella-0.97.1.tar.bz2/src/dht/rpc.h Changed

gtk-gnutella-0.97.tar.bz2/src/dht/stable.c -> gtk-gnutella-0.97.1.tar.bz2/src/dht/stable.c Changed

gtk-gnutella-0.97.tar.bz2/src/dht/stable.h -> gtk-gnutella-0.97.1.tar.bz2/src/dht/stable.h Changed

gtk-gnutella-0.97.tar.bz2/src/dht/tcache.c -> gtk-gnutella-0.97.1.tar.bz2/src/dht/tcache.c Changed

gtk-gnutella-0.97.tar.bz2/src/dht/tcache.h -> gtk-gnutella-0.97.1.tar.bz2/src/dht/tcache.h Changed

gtk-gnutella-0.97.tar.bz2/src/dht/token.c -> gtk-gnutella-0.97.1.tar.bz2/src/dht/token.c Changed

gtk-gnutella-0.97.tar.bz2/src/dht/token.h -> gtk-gnutella-0.97.1.tar.bz2/src/dht/token.h Changed

gtk-gnutella-0.97.tar.bz2/src/dht/ulq.c -> gtk-gnutella-0.97.1.tar.bz2/src/dht/ulq.c Changed

gtk-gnutella-0.97.tar.bz2/src/dht/ulq.h -> gtk-gnutella-0.97.1.tar.bz2/src/dht/ulq.h Changed

gtk-gnutella-0.97.tar.bz2/src/dht/values.c -> gtk-gnutella-0.97.1.tar.bz2/src/dht/values.c Changed

gtk-gnutella-0.97.tar.bz2/src/dht/values.h -> gtk-gnutella-0.97.1.tar.bz2/src/dht/values.h Changed

gtk-gnutella-0.97.tar.bz2/src/gtk-gnutella.h -> gtk-gnutella-0.97.1.tar.bz2/src/gtk-gnutella.h Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: gtk-gnutella.h 19337 2011-07-18 07:18:09Z rmanfredi $
- *
  * Copyright (c) 2009, Raphael Manfredi
  *
  *----------------------------------------------------------------------
@@ -42,10 +40,10 @@
 #define GTA_PRODUCT_NAME "gtk-gnutella"	/**< Normally "gtk-gnutella" */
 #define GTA_VERSION 0				/**< major version */
 #define GTA_SUBVERSION 97			/**< minor version */
-#define GTA_PATCHLEVEL 0			/**< patch level or teeny version */
+#define GTA_PATCHLEVEL 1			/**< patch level or teeny version */
 #define GTA_REVISION "stable"		/**< unstable, beta, stable */
 #define GTA_REVCHAR ""				/**< (u)nstable, (b)eta, none -> stable */
-#define GTA_RELEASE "2011-07-18"	/**< ISO 8601 format YYYY-MM-DD */
+#define GTA_RELEASE "2011-09-11"	/**< ISO 8601 format YYYY-MM-DD */
 #define GTA_WEBSITE "http://gtk-gnutella.sourceforge.net/"
 
 #if defined(USE_GTK1)
@@ -71,7 +69,7 @@
 #define GTA_PORT			6346	/**< Default "standard" port */
 
 #ifndef GTA_BUILD
-#define GTA_BUILD					"$Revision: 19337 $"
+#define GTA_BUILD					"$Revision$"
 #endif
 
 #endif	/* _gtk_gnutella_h_ */

gtk-gnutella-0.97.tar.bz2/src/if/Jmakefile -> gtk-gnutella-0.97.1.tar.bz2/src/if/Jmakefile Changed

gtk-gnutella-0.97.tar.bz2/src/if/bridge/Jmakefile -> gtk-gnutella-0.97.1.tar.bz2/src/if/bridge/Jmakefile Changed

gtk-gnutella-0.97.tar.bz2/src/if/bridge/c2ui.c -> gtk-gnutella-0.97.1.tar.bz2/src/if/bridge/c2ui.c Changed

gtk-gnutella-0.97.tar.bz2/src/if/bridge/c2ui.h -> gtk-gnutella-0.97.1.tar.bz2/src/if/bridge/c2ui.h Changed

gtk-gnutella-0.97.tar.bz2/src/if/bridge/ui2c.c -> gtk-gnutella-0.97.1.tar.bz2/src/if/bridge/ui2c.c Changed

gtk-gnutella-0.97.tar.bz2/src/if/bridge/ui2c.h -> gtk-gnutella-0.97.1.tar.bz2/src/if/bridge/ui2c.h Changed

gtk-gnutella-0.97.tar.bz2/src/if/core/bitzi.h -> gtk-gnutella-0.97.1.tar.bz2/src/if/core/bitzi.h Changed

gtk-gnutella-0.97.tar.bz2/src/if/core/bsched.h -> gtk-gnutella-0.97.1.tar.bz2/src/if/core/bsched.h Changed

gtk-gnutella-0.97.tar.bz2/src/if/core/downloads.h -> gtk-gnutella-0.97.1.tar.bz2/src/if/core/downloads.h Changed

gtk-gnutella-0.97.tar.bz2/src/if/core/fileinfo.h -> gtk-gnutella-0.97.1.tar.bz2/src/if/core/fileinfo.h Changed

gtk-gnutella-0.97.tar.bz2/src/if/core/filter.h -> gtk-gnutella-0.97.1.tar.bz2/src/if/core/filter.h Changed

gtk-gnutella-0.97.tar.bz2/src/if/core/gnutella.h -> gtk-gnutella-0.97.1.tar.bz2/src/if/core/gnutella.h Changed

gtk-gnutella-0.97.tar.bz2/src/if/core/guid.h -> gtk-gnutella-0.97.1.tar.bz2/src/if/core/guid.h Changed

gtk-gnutella-0.97.tar.bz2/src/if/core/hcache.h -> gtk-gnutella-0.97.1.tar.bz2/src/if/core/hcache.h Changed

gtk-gnutella-0.97.tar.bz2/src/if/core/hsep.h -> gtk-gnutella-0.97.1.tar.bz2/src/if/core/hsep.h Changed

gtk-gnutella-0.97.tar.bz2/src/if/core/http.h -> gtk-gnutella-0.97.1.tar.bz2/src/if/core/http.h Changed

gtk-gnutella-0.97.tar.bz2/src/if/core/main.h -> gtk-gnutella-0.97.1.tar.bz2/src/if/core/main.h Changed

gtk-gnutella-0.97.tar.bz2/src/if/core/mq.h -> gtk-gnutella-0.97.1.tar.bz2/src/if/core/mq.h Changed

gtk-gnutella-0.97.tar.bz2/src/if/core/net_stats.h -> gtk-gnutella-0.97.1.tar.bz2/src/if/core/net_stats.h Changed

gtk-gnutella-0.97.tar.bz2/src/if/core/nodes.h -> gtk-gnutella-0.97.1.tar.bz2/src/if/core/nodes.h Changed

gtk-gnutella-0.97.tar.bz2/src/if/core/parq.h -> gtk-gnutella-0.97.1.tar.bz2/src/if/core/parq.h Changed

gtk-gnutella-0.97.tar.bz2/src/if/core/pproxy.h -> gtk-gnutella-0.97.1.tar.bz2/src/if/core/pproxy.h Changed

gtk-gnutella-0.97.tar.bz2/src/if/core/search.h -> gtk-gnutella-0.97.1.tar.bz2/src/if/core/search.h Changed

gtk-gnutella-0.97.tar.bz2/src/if/core/settings.h -> gtk-gnutella-0.97.1.tar.bz2/src/if/core/settings.h Changed

gtk-gnutella-0.97.tar.bz2/src/if/core/share.h -> gtk-gnutella-0.97.1.tar.bz2/src/if/core/share.h Changed

gtk-gnutella-0.97.tar.bz2/src/if/core/sockets.h -> gtk-gnutella-0.97.1.tar.bz2/src/if/core/sockets.h Changed

gtk-gnutella-0.97.tar.bz2/src/if/core/upload_stats.h -> gtk-gnutella-0.97.1.tar.bz2/src/if/core/upload_stats.h Changed

gtk-gnutella-0.97.tar.bz2/src/if/core/uploads.h -> gtk-gnutella-0.97.1.tar.bz2/src/if/core/uploads.h Changed

gtk-gnutella-0.97.tar.bz2/src/if/core/version.h -> gtk-gnutella-0.97.1.tar.bz2/src/if/core/version.h Changed

gtk-gnutella-0.97.tar.bz2/src/if/core/wrap.h -> gtk-gnutella-0.97.1.tar.bz2/src/if/core/wrap.h Changed

gtk-gnutella-0.97.tar.bz2/src/if/dht/dht.h -> gtk-gnutella-0.97.1.tar.bz2/src/if/dht/dht.h Changed

gtk-gnutella-0.97.tar.bz2/src/if/dht/kademlia.h -> gtk-gnutella-0.97.1.tar.bz2/src/if/dht/kademlia.h Changed

gtk-gnutella-0.97.tar.bz2/src/if/dht/kmsg.h -> gtk-gnutella-0.97.1.tar.bz2/src/if/dht/kmsg.h Changed

gtk-gnutella-0.97.tar.bz2/src/if/dht/knode.h -> gtk-gnutella-0.97.1.tar.bz2/src/if/dht/knode.h Changed

gtk-gnutella-0.97.tar.bz2/src/if/dht/kuid.h -> gtk-gnutella-0.97.1.tar.bz2/src/if/dht/kuid.h Changed

gtk-gnutella-0.97.tar.bz2/src/if/dht/lookup.h -> gtk-gnutella-0.97.1.tar.bz2/src/if/dht/lookup.h Changed

gtk-gnutella-0.97.tar.bz2/src/if/dht/publish.h -> gtk-gnutella-0.97.1.tar.bz2/src/if/dht/publish.h Changed

gtk-gnutella-0.97.tar.bz2/src/if/dht/routing.h -> gtk-gnutella-0.97.1.tar.bz2/src/if/dht/routing.h Changed

gtk-gnutella-0.97.tar.bz2/src/if/dht/stable.h -> gtk-gnutella-0.97.1.tar.bz2/src/if/dht/stable.h Changed

gtk-gnutella-0.97.tar.bz2/src/if/dht/value.h -> gtk-gnutella-0.97.1.tar.bz2/src/if/dht/value.h Changed

gtk-gnutella-0.97.tar.bz2/src/if/gnet_property.c -> gtk-gnutella-0.97.1.tar.bz2/src/if/gnet_property.c Changed

@@ -345,8 +345,8 @@
 static const guint32  gnet_property_variable_min_dup_msg_default = 5;
 guint32  gnet_property_variable_min_dup_ratio     = 150;
 static const guint32  gnet_property_variable_min_dup_ratio_default = 150;
-char   *gnet_property_variable_scan_extensions     = "aac;avi;bin;bz2;7z;cue;deb;divx;flac;flc;fli;gif;gz;ifo;iso;it;jpeg;jpg;m4a;mjpg;mka;mkv;mod;mov;mp1;mp2;mp3;mp4;mpa;mpeg;mpega;mpg;mpv;nes;oga;ogg;ogm;ogv;qt;pdf;png;ps;ram;rar;rm;rom;rpm;s3m;shn;sid;smc;smd;spx;srt;stm;tar;tbz2;tgz;bittorrent;torrent;txt;vob;voc;vqf;wav;xm;xvid;zip";
-static const char   *gnet_property_variable_scan_extensions_default = "aac;avi;bin;bz2;7z;cue;deb;divx;flac;flc;fli;gif;gz;ifo;iso;it;jpeg;jpg;m4a;mjpg;mka;mkv;mod;mov;mp1;mp2;mp3;mp4;mpa;mpeg;mpega;mpg;mpv;nes;oga;ogg;ogm;ogv;qt;pdf;png;ps;ram;rar;rm;rom;rpm;s3m;shn;sid;smc;smd;spx;srt;stm;tar;tbz2;tgz;bittorrent;torrent;txt;vob;voc;vqf;wav;xm;xvid;zip";
+char   *gnet_property_variable_scan_extensions     = "aac;avi;bin;bz2;7z;cue;dmg;deb;divx;flac;flc;fli;gif;gz;ifo;iso;it;jpeg;jpg;m4a;mjpg;mka;mkv;mod;mov;mp1;mp2;mp3;mp4;mpa;mpeg;mpega;mpg;mpv;nes;oga;ogg;ogm;ogv;qt;pdf;png;ps;ram;rar;rm;rom;rpm;s3m;shn;sid;smc;smd;spx;srt;stm;tar;tbz2;tgz;bittorrent;torrent;txt;vob;voc;vqf;wav;xm;xvid;zip";
+static const char   *gnet_property_variable_scan_extensions_default = "aac;avi;bin;bz2;7z;cue;dmg;deb;divx;flac;flc;fli;gif;gz;ifo;iso;it;jpeg;jpg;m4a;mjpg;mka;mkv;mod;mov;mp1;mp2;mp3;mp4;mpa;mpeg;mpega;mpg;mpv;nes;oga;ogg;ogm;ogv;qt;pdf;png;ps;ram;rar;rm;rom;rpm;s3m;shn;sid;smc;smd;spx;srt;stm;tar;tbz2;tgz;bittorrent;torrent;txt;vob;voc;vqf;wav;xm;xvid;zip";
 gboolean gnet_property_variable_scan_ignore_symlink_dirs     = FALSE;
 static const gboolean gnet_property_variable_scan_ignore_symlink_dirs_default = FALSE;
 gboolean gnet_property_variable_scan_ignore_symlink_regfiles     = FALSE;
@@ -807,8 +807,8 @@
 static const guint32  gnet_property_variable_palloc_debug_default = 0;
 guint32  gnet_property_variable_rxbuf_debug     = 0;
 static const guint32  gnet_property_variable_rxbuf_debug_default = 0;
-gboolean gnet_property_variable_zalloc_always_gc     = TRUE;
-static const gboolean gnet_property_variable_zalloc_always_gc_default = TRUE;
+gboolean gnet_property_variable_zalloc_always_gc     = FALSE;
+static const gboolean gnet_property_variable_zalloc_always_gc_default = FALSE;
 guint32  gnet_property_variable_vmm_debug     = 0;
 static const guint32  gnet_property_variable_vmm_debug_default = 0;
 guint32  gnet_property_variable_shutdown_debug     = 0;
@@ -1003,7 +1003,7 @@
 
 static prop_set_t *gnet_property;
 
-prop_set_t *
+G_GNUC_COLD prop_set_t *
 gnet_prop_init(void) {
     guint32 n;
 
@@ -9187,7 +9187,7 @@
 /**
  * Free memory allocated by the property set.
  */
-void
+G_GNUC_COLD void
 gnet_prop_shutdown(void) {
     guint32 n;

gtk-gnutella-0.97.tar.bz2/src/if/gnet_props.ag -> gtk-gnutella-0.97.1.tar.bz2/src/if/gnet_props.ag Changed

gtk-gnutella-0.97.tar.bz2/src/if/gui_property.c -> gtk-gnutella-0.97.1.tar.bz2/src/if/gui_property.c Changed

gtk-gnutella-0.97.tar.bz2/src/if/gui_props.ag -> gtk-gnutella-0.97.1.tar.bz2/src/if/gui_props.ag Changed

gtk-gnutella-0.97.tar.bz2/src/if/props.tpl -> gtk-gnutella-0.97.1.tar.bz2/src/if/props.tpl Changed

gtk-gnutella-0.97.tar.bz2/src/if/ui/gtk/bitzi.h -> gtk-gnutella-0.97.1.tar.bz2/src/if/ui/gtk/bitzi.h Changed

gtk-gnutella-0.97.tar.bz2/src/if/ui/gtk/downloads.h -> gtk-gnutella-0.97.1.tar.bz2/src/if/ui/gtk/downloads.h Changed

gtk-gnutella-0.97.tar.bz2/src/if/ui/gtk/gnet_stats.h -> gtk-gnutella-0.97.1.tar.bz2/src/if/ui/gtk/gnet_stats.h Changed

gtk-gnutella-0.97.tar.bz2/src/if/ui/gtk/misc.h -> gtk-gnutella-0.97.1.tar.bz2/src/if/ui/gtk/misc.h Changed

gtk-gnutella-0.97.tar.bz2/src/if/ui/gtk/search.h -> gtk-gnutella-0.97.1.tar.bz2/src/if/ui/gtk/search.h Changed

gtk-gnutella-0.97.tar.bz2/src/if/ui/gtk/statusbar.h -> gtk-gnutella-0.97.1.tar.bz2/src/if/ui/gtk/statusbar.h Changed

gtk-gnutella-0.97.tar.bz2/src/if/ui/gtk/upload_stats.h -> gtk-gnutella-0.97.1.tar.bz2/src/if/ui/gtk/upload_stats.h Changed

gtk-gnutella-0.97.tar.bz2/src/if/ui/gtk/uploads.h -> gtk-gnutella-0.97.1.tar.bz2/src/if/ui/gtk/uploads.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/Jmakefile -> gtk-gnutella-0.97.1.tar.bz2/src/lib/Jmakefile Changed

gtk-gnutella-0.97.tar.bz2/src/lib/adns.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/adns.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/adns.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/adns.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/aging.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/aging.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/aging.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/aging.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/arc4random.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/arc4random.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/arc4random.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/arc4random.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/array.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/array.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/ascii.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/ascii.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/ascii.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/ascii.h Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: ascii.h 19211 2011-06-02 10:12:41Z rmanfredi $
- *
  * Copyright (c) 2001-2008, Christian Biere & Raphael Manfredi
  *
  *----------------------------------------------------------------------
@@ -180,7 +178,7 @@
  *
  * @return a pointer to the first non-space character starting from s.
  */
-static inline WARN_UNUSED_RESULT char *
+static inline G_GNUC_PURE WARN_UNUSED_RESULT char *
 skip_ascii_spaces(const char *s)
 {
 	while (is_ascii_space(*s))
@@ -194,7 +192,7 @@
  *
  * @return a pointer to the first space or NUL character starting from s.
  */
-static inline WARN_UNUSED_RESULT char *
+static inline G_GNUC_PURE WARN_UNUSED_RESULT char *
 skip_ascii_non_spaces(const char *s)
 {
 	while ('\0' != *s && !is_ascii_space(*s))
@@ -210,7 +208,7 @@
  * @return a pointer to the first non-alphanumerical or NUL character
  * starting from s.
  */
-static inline WARN_UNUSED_RESULT char *
+static inline G_GNUC_PURE WARN_UNUSED_RESULT char *
 skip_ascii_alnum(const char *s)
 {
 	while (is_ascii_alnum(*s))
@@ -224,7 +222,7 @@
  *
  * @return A pointer to the first non-blank character starting from s.
  */
-static inline WARN_UNUSED_RESULT char *
+static inline G_GNUC_PURE WARN_UNUSED_RESULT char *
 skip_ascii_blanks(const char *s)
 {
 	while (is_ascii_blank(*s))

gtk-gnutella-0.97.tar.bz2/src/lib/atoms.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/atoms.c Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: atoms.c 19191 2011-05-30 22:18:28Z rmanfredi $
- *
  * Copyright (c) 2002-2003, Raphael Manfredi
  *
  *----------------------------------------------------------------------
@@ -43,8 +41,6 @@
 #include "atoms.h"
 #include "endian.h"
 
-RCSID("$Id: atoms.c 19191 2011-05-30 22:18:28Z rmanfredi $")
-
 #if 0
 #define PROTECT_ATOMS
 #endif
@@ -473,7 +469,7 @@
 /**
  * Hash `len' bytes starting from `data'.
  */
-guint
+G_GNUC_HOT guint
 binary_hash(gconstpointer data, size_t len)
 {
 	const unsigned char *key = data;
@@ -521,22 +517,7 @@
 int
 guid_eq(gconstpointer a, gconstpointer b)
 {
-/* FIXME:	Disabled because of alignment problems
- *			This should work if guid was declared as guint324 or for
- *			architectures that require no certain alignment.
- */
-#if 0
-	const guint32 *ax = (const guint32 *) a;
-	const guint32 *bx = (const guint32 *) b;
-
-	return
-		ax0 == bx0 &&
-		ax1 == bx1 &&
-		ax2 == bx2 &&
-		ax3 == bx3;
-#else
 	return a == b || 0 == memcmp(a, b, GUID_RAW_SIZE);
-#endif
 }
 
 /**

gtk-gnutella-0.97.tar.bz2/src/lib/atoms.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/atoms.h Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: atoms.h 17584 2010-10-29 15:21:18Z rmanfredi $
- *
  * Copyright (c) 2002-2003, Raphael Manfredi
  *
  *----------------------------------------------------------------------
@@ -258,21 +256,21 @@
 /*
  * Hash functions and equality checks
  */
-guint filesize_hash(gconstpointer key);
-int filesize_eq(gconstpointer a, gconstpointer b);
-guint sha1_hash(gconstpointer key);
-int sha1_eq(gconstpointer a, gconstpointer b);
-guint tth_hash(gconstpointer key);
-int tth_eq(gconstpointer a, gconstpointer b);
-guint guid_hash(gconstpointer key);
-int guid_eq(gconstpointer a, gconstpointer b);
-guint uint64_hash(gconstpointer key);
-int uint64_eq(gconstpointer a, gconstpointer b);
-guint uint64_mem_hash(gconstpointer key);
-int uint64_mem_eq(gconstpointer a, gconstpointer b);
-guint binary_hash(gconstpointer key, size_t len);
-guint uint32_hash(gconstpointer key);
-int uint32_eq(gconstpointer a, gconstpointer b);
+guint filesize_hash(gconstpointer key) G_GNUC_PURE;
+int filesize_eq(gconstpointer a, gconstpointer b) G_GNUC_PURE;
+guint sha1_hash(gconstpointer key) G_GNUC_PURE;
+int sha1_eq(gconstpointer a, gconstpointer b) G_GNUC_PURE;
+guint tth_hash(gconstpointer key) G_GNUC_CONST;
+int tth_eq(gconstpointer a, gconstpointer b) G_GNUC_PURE;
+guint guid_hash(gconstpointer key) G_GNUC_CONST;
+int guid_eq(gconstpointer a, gconstpointer b) G_GNUC_PURE;
+guint uint64_hash(gconstpointer key) G_GNUC_CONST;
+int uint64_eq(gconstpointer a, gconstpointer b) G_GNUC_PURE;
+guint uint64_mem_hash(gconstpointer key) G_GNUC_PURE;
+int uint64_mem_eq(gconstpointer a, gconstpointer b) G_GNUC_PURE;
+guint binary_hash(gconstpointer key, size_t len) G_GNUC_PURE;
+guint uint32_hash(gconstpointer key) G_GNUC_PURE;
+int uint32_eq(gconstpointer a, gconstpointer b) G_GNUC_PURE;
 
 #ifdef TRACK_ATOMS
 gconstpointer atom_get_track(enum atom_type, gconstpointer key,

gtk-gnutella-0.97.tar.bz2/src/lib/base16.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/base16.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/base16.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/base16.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/base32.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/base32.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/base32.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/base32.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/base64.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/base64.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/base64.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/base64.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/bg.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/bg.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/bg.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/bg.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/bit_array.ht -> gtk-gnutella-0.97.1.tar.bz2/src/lib/bit_array.ht Changed

gtk-gnutella-0.97.tar.bz2/src/lib/bit_field.ht -> gtk-gnutella-0.97.1.tar.bz2/src/lib/bit_field.ht Changed

gtk-gnutella-0.97.tar.bz2/src/lib/bit_generic.t -> gtk-gnutella-0.97.1.tar.bz2/src/lib/bit_generic.t Changed

gtk-gnutella-0.97.tar.bz2/src/lib/bstr.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/bstr.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/bstr.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/bstr.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/ckalloc.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/ckalloc.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/ckalloc.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/ckalloc.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/cobs.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/cobs.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/cobs.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/cobs.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/compat_misc.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/compat_misc.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/compat_misc.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/compat_misc.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/compat_pio.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/compat_pio.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/compat_pio.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/compat_pio.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/compat_poll.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/compat_poll.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/compat_poll.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/compat_poll.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/compat_sleep_ms.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/compat_sleep_ms.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/compat_sleep_ms.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/compat_sleep_ms.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/compat_un.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/compat_un.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/compat_un.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/compat_un.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/concat.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/concat.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/concat.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/concat.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/cpufreq.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/cpufreq.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/cpufreq.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/cpufreq.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/cq.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/cq.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/cq.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/cq.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/crash.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/crash.c Changed

@@ -69,8 +69,6 @@
 
 #include "common.h"
 
-RCSID("$Id: crash.c 19191 2011-05-30 22:18:28Z rmanfredi $")
-
 #include "crash.h"
 #include "ckalloc.h"
 #include "compat_sleep_ms.h"
@@ -171,7 +169,7 @@
 /**
  * Append positive value to buffer, formatted as "%02u".
  */
-static void
+static G_GNUC_COLD void
 crash_append_fmt_02u(cursor_t *cursor, long v)
 {
 	if (cursor->size < 2 || v < 0)
@@ -195,7 +193,7 @@
 /**
  * Append positive value to buffer, formatted as "%u".
  */
-static void
+static G_GNUC_COLD void
 crash_append_fmt_u(cursor_t *cursor, unsigned long v)
 {
 	char bufULONG_DEC_BUFLEN;
@@ -216,7 +214,7 @@
 /**
  * Append a character to supplied buffer.
  */
-static void
+static G_GNUC_COLD void
 crash_append_fmt_c(cursor_t *cursor, unsigned char c)
 {
 	if (cursor->size < 1)
@@ -233,7 +231,7 @@
  * This routine can safely be used in a signal handler as it does not rely
  * on unsafe calls.
  */
-void
+G_GNUC_COLD void
 crash_time(char *buf, size_t size)
 {
 	const size_t num_reserved = 1;
@@ -276,7 +274,7 @@
  * This routine can safely be used in a signal handler as it does not rely
  * on unsafe calls.
  */
-void
+G_GNUC_COLD void
 crash_time_iso(char *buf, size_t size)
 {
 	const size_t num_reserved = 1;
@@ -317,7 +315,7 @@
  * This routine can safely be used in a signal handler as it does not rely
  * on unsafe calls.
  */
-static void
+static G_GNUC_COLD void
 crash_run_time(char *buf, size_t size)
 {
 	const size_t num_reserved = 1;
@@ -365,7 +363,7 @@
 /**
  * Emit leading crash information: who crashed and why.
  */
-static void
+static G_GNUC_COLD void
 crash_message(const char *signame, gboolean trace, gboolean recursive)
 {
 	DECLARE_STR(11);
@@ -418,7 +416,7 @@
 /**
  * Marks end of crash logging and potential pausing or debugger hook calling.
  */
-static void
+static G_GNUC_COLD void
 crash_end_of_line(void)
 {
 	DECLARE_STR(7);
@@ -452,7 +450,7 @@
 /**
  * Construct name of GTKG crash log.
  */
-static void
+static G_GNUC_COLD void
 crash_logname(char *buf, size_t len, const char *pidstr)
 {
 	clamp_strcpy(buf, len, EMPTY_STRING(vars->progname));
@@ -480,7 +478,7 @@
  * Emit the current stack frame to specified file, or the assertion stack
  * if we have one.
  */
-static NO_INLINE void
+static G_GNUC_COLD NO_INLINE void
 crash_stack_print(int fd, size_t offset)
 {
 	if (vars != NULL && vars->stackcnt != 0) {
@@ -495,7 +493,7 @@
  * Invoke the inspector process (gdb, or any other program specified at
  * initialization time).
  */
-static void
+static G_GNUC_COLD void
 crash_invoke_inspector(int signo, const char *cwd)
 {
    	const char *pid_str;
@@ -981,7 +979,7 @@
 /**
  * The signal handler used to trap harmful signals.
  */
-void
+G_GNUC_COLD void
 crash_handler(int signo)
 {
 	static volatile sig_atomic_t crashed;
@@ -1115,7 +1113,7 @@
  * @param flags		any combination of CRASH_F_GDB and CRASH_F_PAUSE
  * @parah exec_path	pathname of custom program to execute on crash
  */
-void
+G_GNUC_COLD void
 crash_init(const char *argv0, const char *progname,
 	int flags, const char *exec_path)
 {
@@ -1238,7 +1236,7 @@
  * @param dst_size The size of the destination buffer in bytes.
  * @return Required buffer size.
  */
-static size_t
+static G_GNUC_COLD size_t
 crashfile_name(char *dst, size_t dst_size, const char *pathname)
 {
 	const char *pid_str, *item;
@@ -1277,7 +1275,7 @@
 /**
  * Record current working directory and configured crash directory.
  */
-void
+G_GNUC_COLD void
 crash_setdir(const char *pathname)
 {
 	const char *curdir = NULL;
@@ -1334,7 +1332,7 @@
 /**
  * Record program's version string.
  */
-void
+G_GNUC_COLD void
 crash_setver(const char *version)
 {
 	const char *value;
@@ -1384,7 +1382,7 @@
  * Save given stack trace, which will be displayed during crashes instead
  * of the current stack frame.
  */
-void
+G_GNUC_COLD void
 crash_save_stackframe(void *stack, size_t count)
 {
 	if (count > G_N_ELEMENTS(vars->stack))
@@ -1404,7 +1402,7 @@
  * is to protect against SIGABRT signal delivery happening on a dedicated
  * signal stack.
  */
-void
+G_GNUC_COLD void
 crash_save_current_stackframe(void)
 {
 	if (vars != NULL) {

gtk-gnutella-0.97.tar.bz2/src/lib/crc.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/crc.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/crc.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/crc.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/dbmap.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/dbmap.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/dbmap.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/dbmap.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/dbmw.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/dbmw.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/dbmw.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/dbmw.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/dbstore.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/dbstore.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/dbstore.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/dbstore.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/dbus_util.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/dbus_util.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/dbus_util.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/dbus_util.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/debug.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/debug.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/debug.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/debug.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/dualhash.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/dualhash.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/dualhash.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/dualhash.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/endian.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/endian.h Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: endian.h 18969 2011-04-12 11:26:29Z rmanfredi $
- *
  * Copyright (c) 2001-2003, Raphael Manfredi
  *
  *----------------------------------------------------------------------
@@ -33,14 +31,14 @@
  * or little-endian.
  */
 
-static inline ALWAYS_INLINE unsigned char
+static inline ALWAYS_INLINE G_GNUC_PURE unsigned char
 peek_u8(const void *p)
 {
 	const unsigned char *q = p;
 	return q0 & 0xff;
 }
 
-static inline ALWAYS_INLINE guint16
+static inline ALWAYS_INLINE G_GNUC_PURE guint16
 peek_u16(const void *p)
 {
 	const unsigned char *q = p;
@@ -49,7 +47,7 @@
 	return v;
 }
 
-static inline ALWAYS_INLINE guint32
+static inline ALWAYS_INLINE G_GNUC_PURE guint32
 peek_u32(const void *p)
 {
 	const unsigned char *q = p;
@@ -58,7 +56,7 @@
 	return v;
 }
 
-static inline ALWAYS_INLINE guint64
+static inline ALWAYS_INLINE G_GNUC_PURE guint64
 peek_u64(const void *p)
 {
 	const unsigned char *q = p;
@@ -67,7 +65,7 @@
 	return v;
 }
 
-static inline guint16
+static inline G_GNUC_PURE guint16
 peek_be16(const void *p)
 {
 	const unsigned char *q = p;
@@ -81,7 +79,7 @@
 	return v;
 }
 
-static inline guint32
+static inline G_GNUC_PURE guint32
 peek_be32(const void *p)
 {
 	const unsigned char *q = p;
@@ -95,7 +93,7 @@
 	return v;
 }
 
-static inline guint64
+static inline G_GNUC_PURE guint64
 peek_be64(const void *p)
 {
 	const unsigned char *q = p;
@@ -109,7 +107,7 @@
 	return v;
 }
 
-static inline guint16
+static inline G_GNUC_PURE guint16
 peek_le16(const void *p)
 {
 	const unsigned char *q = p;
@@ -123,7 +121,7 @@
 	return v;
 }
 
-static inline guint32
+static inline G_GNUC_PURE guint32
 peek_le32(const void *p)
 {
 	const unsigned char *q = p;
@@ -284,7 +282,7 @@
 	return poke_be32(p, tmp);
 }
 
-static inline float
+static inline G_GNUC_PURE float
 peek_float_be32(const void *p)
 {
 	guint32 tmp;

gtk-gnutella-0.97.tar.bz2/src/lib/entropy.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/entropy.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/entropy.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/entropy.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/eval.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/eval.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/eval.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/eval.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/event.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/event.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/event.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/event.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/fast_assert.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/fast_assert.c Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: fast_assert.c 18930 2011-04-05 06:23:56Z rmanfredi $
- *
  * Copyright (c) 2006, Christian Biere
  *
  *----------------------------------------------------------------------
@@ -35,8 +33,6 @@
 
 #include "common.h"
 
-RCSID("$Id: fast_assert.c 18930 2011-04-05 06:23:56Z rmanfredi $")
-
 #include "crash.h"				/* For print_str() and crash_time() */
 #include "fast_assert.h"
 #include "log.h"
@@ -48,7 +44,7 @@
  *       even use assertions in signal handlers. See also:
  * http://www.opengroup.org/onlinepubs/009695399/functions/xsh_chap02_04.html
  */
-static void
+static G_GNUC_COLD void
 assertion_message(const assertion_data * const data, int fatal)
 {
 	char line_buf22;
@@ -86,7 +82,7 @@
  *		--RAM, 2009-10-31
  */
 
-NO_INLINE void NON_NULL_PARAM((1)) /* REGPARM(1) */
+NO_INLINE void G_GNUC_COLD NON_NULL_PARAM((1)) /* REGPARM(1) */
 assertion_warning(const assertion_data * const data)
 {
 	assertion_message(data, FALSE);
@@ -100,7 +96,7 @@
 		stacktrace_where_safe_print_offset(STDOUT_FILENO, 1);
 }
 
-NO_INLINE void G_GNUC_NORETURN NON_NULL_PARAM((1)) /* REGPARM(1) */
+NO_INLINE void G_GNUC_COLD G_GNUC_NORETURN NON_NULL_PARAM((1)) /* REGPARM(1) */
 assertion_failure(const assertion_data * const data)
 {
 	static volatile sig_atomic_t seen_fatal;

gtk-gnutella-0.97.tar.bz2/src/lib/fast_assert.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/fast_assert.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/fd.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/fd.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/fd.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/fd.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/fifo.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/fifo.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/fifo.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/fifo.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/file.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/file.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/file.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/file.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/filehead.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/filehead.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/filehead.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/filehead.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/filename.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/filename.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/filename.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/filename.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/fragcheck.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/fragcheck.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/fragcheck.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/fragcheck.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/fs_free_space.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/fs_free_space.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/fs_free_space.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/fs_free_space.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/getdate.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/getdate.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/getdate.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/getdate.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/getdate.y -> gtk-gnutella-0.97.1.tar.bz2/src/lib/getdate.y Changed

gtk-gnutella-0.97.tar.bz2/src/lib/getgateway.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/getgateway.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/getgateway.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/getgateway.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/getline.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/getline.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/getline.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/getline.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/getphysmemsize.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/getphysmemsize.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/getphysmemsize.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/getphysmemsize.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/glib-missing.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/glib-missing.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/glib-missing.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/glib-missing.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/gnet_host.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/gnet_host.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/gnet_host.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/gnet_host.h Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: gnet_host.h 19266 2011-06-15 16:02:31Z rmanfredi $
- *
  * Copyright (c) 2009, Raphael Manfredi
  * Copyright (c) 2006-2008, Christian Biere
  * Copyright (c) 2001-2003, Richard Eckart
@@ -93,31 +91,29 @@
 gnet_host_get_addr(const gnet_host_t *h)
 {
 	host_addr_t addr;
-	packed_host_unpack(&h->data, &addr, NULL);
+	packed_host_unpack_addr(&h->data, &addr);
 	return addr;
 }
 
-static inline guint16
+static inline G_GNUC_PURE ALWAYS_INLINE guint16
 gnet_host_get_port(const gnet_host_t *h)
 {
-	guint16 port;
-	packed_host_unpack(&h->data, NULL, &port);
-	return port;
+	return peek_be16(&h->data.port);
 }
 
-static inline enum net_type
+static inline G_GNUC_PURE enum net_type
 gnet_host_get_net(const gnet_host_t *h)
 {
 	return h->data.ha.net;
 }
 
-static inline G_GNUC_CONST gboolean
+static inline G_GNUC_PURE gboolean
 gnet_host_is_ipv4(const gnet_host_t *h)
 {
 	return NET_TYPE_IPV4 == h->data.ha.net;
 }
 
-static inline G_GNUC_CONST gboolean
+static inline G_GNUC_PURE gboolean
 gnet_host_is_ipv6(const gnet_host_t *h)
 {
 	return NET_TYPE_IPV6 == h->data.ha.net;
@@ -132,9 +128,9 @@
  * Gnutella host hashing and comparison functions.
  */
 
-guint gnet_host_hash(gconstpointer key);
-int gnet_host_eq(gconstpointer v1, gconstpointer v2);
-int gnet_host_cmp(gconstpointer v1, gconstpointer v2);
+guint gnet_host_hash(gconstpointer key) G_GNUC_PURE;
+int gnet_host_eq(gconstpointer v1, gconstpointer v2) G_GNUC_PURE;
+int gnet_host_cmp(gconstpointer v1, gconstpointer v2) G_GNUC_PURE;
 
 /*
  * Serialized IPv4 and IPv6 Gnutella hosts.

gtk-gnutella-0.97.tar.bz2/src/lib/halloc.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/halloc.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/halloc.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/halloc.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/hashlist.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/hashlist.c Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: hashlist.c 19331 2011-07-15 20:12:50Z rmanfredi $
- *
  * Copyright (c) 2003, Christian Biere
  *
  *----------------------------------------------------------------------
@@ -45,8 +43,6 @@
 
 #include "common.h"
 
-RCSID("$Id: hashlist.c 19331 2011-07-15 20:12:50Z rmanfredi $")
-
 #include "hashlist.h"
 #include "misc.h"
 #include "glib-missing.h"
@@ -86,7 +82,7 @@
 	struct hash_list_item *item;
 };
 
-static void
+static G_GNUC_HOT void
 hash_list_iter_check(const hash_list_iter_t * const iter)
 {
 	g_assert(NULL != iter);
@@ -118,7 +114,7 @@
 #define hash_list_regression(hl)
 #endif
 
-static void
+static G_GNUC_HOT void
 hash_list_check(const hash_list_t * const hl)
 {
 	g_assert(NULL != hl);
@@ -874,7 +870,7 @@
 /**
  * Get the next data item from the iterator, or NULL if none.
  */
-void *
+G_GNUC_HOT void *
 hash_list_iter_next(hash_list_iter_t *iter)
 {
 	GList *next;
@@ -906,7 +902,7 @@
 /**
  * Get the previous data item from the iterator, or NULL if none.
  */
-void *
+G_GNUC_HOT void *
 hash_list_iter_previous(hash_list_iter_t *iter)
 {
 	GList *prev;

gtk-gnutella-0.97.tar.bz2/src/lib/hashlist.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/hashlist.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/hashtable.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/hashtable.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/hashtable.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/hashtable.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/header.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/header.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/header.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/header.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/host_addr.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/host_addr.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/host_addr.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/host_addr.h Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: host_addr.h 19266 2011-06-15 16:02:31Z rmanfredi $
- *
  * Copyright (c) 2001-2003, Raphael Manfredi
  * Copyright (c) 2005, Christian Biere
  *
@@ -265,7 +263,7 @@
 	return NET_TYPE_IPV6 == ha->net ? ha->addr.ipv6 : NULL;
 }
 
-static inline host_addr_t
+static inline G_GNUC_CONST host_addr_t
 host_addr_get_ipv4(guint32 ip)
 {
 	host_addr_t ha;
@@ -275,13 +273,13 @@
 	return ha;
 }
 
-static inline host_addr_t
+static inline G_GNUC_PURE host_addr_t
 host_addr_peek_ipv4(const void *ipv4)
 {
 	return host_addr_get_ipv4(peek_be32(ipv4));
 }
 
-static inline host_addr_t
+static inline G_GNUC_PURE host_addr_t
 host_addr_peek_ipv6(const guint8 *ipv6)
 {
 	host_addr_t ha;
@@ -399,7 +397,7 @@
 }
 
 
-static inline gboolean
+static inline G_GNUC_PURE gboolean
 is_host_addr(const host_addr_t ha)
 {
 	switch (host_addr_net(ha)) {
@@ -614,13 +612,13 @@
 
 guint packed_host_size(const struct packed_host paddr);
 struct packed_host host_pack(const host_addr_t addr, guint16 port);
-void packed_host_unpack(const struct packed_host *phost,
-		host_addr_t *addr_ptr, guint16 *port_ptr);
-
+void packed_host_unpack_addr(const struct packed_host *phost,
+	host_addr_t *addr_ptr);
 guint packed_host_hash_func(gconstpointer key);
 gboolean packed_host_eq_func(gconstpointer p, gconstpointer q);
 gpointer walloc_packed_host(const host_addr_t addr, guint16 port);
 void wfree_packed_host(gpointer key, gpointer unused_data);
 
 #endif /* _host_addr_h_ */
+
 /* vi: set ts=4 sw=4 cindent: */

gtk-gnutella-0.97.tar.bz2/src/lib/html.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/html.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/html.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/html.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/idtable.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/idtable.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/idtable.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/idtable.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/inputevt.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/inputevt.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/inputevt.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/inputevt.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/iovec.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/iovec.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/iprange.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/iprange.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/iprange.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/iprange.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/iso3166.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/iso3166.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/iso3166.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/iso3166.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/list.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/list.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/list.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/list.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/listener.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/listener.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/log.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/log.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/log.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/log.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/magnet.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/magnet.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/magnet.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/magnet.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/malloc.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/malloc.c Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: malloc.c 19191 2011-05-30 22:18:28Z rmanfredi $
- *
  * Copyright (c) 2004-2010, Raphael Manfredi
  *
  *----------------------------------------------------------------------
@@ -35,8 +33,6 @@
 
 #include "common.h"		/* For RCSID */
 
-RCSID("$Id: malloc.c 19191 2011-05-30 22:18:28Z rmanfredi $")
-
 #if defined(MALLOC_STATS) && !defined(TRACK_MALLOC)
 #define TRACK_MALLOC
 #endif
@@ -2726,7 +2722,7 @@
 /**
  * Dump the links sorted by decreasing leak size.
  */
-void
+G_GNUC_COLD void
 leak_dump(gpointer o)
 {
 	struct leak_set *ls =  o;
@@ -2870,7 +2866,7 @@
 /**
  * Dump the stats held in the specified array.
  */
-static void
+static G_GNUC_COLD void
 stats_array_dump(FILE *f, struct afiller *filler)
 {
 	int i;
@@ -3063,7 +3059,7 @@
  * This routine checks whether calling a simple memory allocation
  * function from glib will cause real_malloc() to be called.
  */
-static void
+static G_GNUC_COLD void
 malloc_glib12_check(void)
 {
 	vtable_works = TRUE;
@@ -3101,7 +3097,7 @@
  * enables us to see frees for blocks we track but give to GTK, and never
  * see again otherwise.
  */
-void
+G_GNUC_COLD void
 malloc_init_vtable(void)
 {
 #if defined(TRACK_MALLOC) || defined(MALLOC_VTABLE)
@@ -3159,7 +3155,7 @@
 /**
  * Called from main() to log settings at startup.
  */
-void
+G_GNUC_COLD void
 malloc_show_settings(void)
 {
 	gboolean has_setting = FALSE;
@@ -3296,7 +3292,7 @@
 /**
  * @return amount of memory used by internal tracking structures.
  */
-size_t
+G_GNUC_COLD size_t
 malloc_memory_used(void)
 {
 	size_t res = 0;
@@ -3320,7 +3316,7 @@
 /**
  * Dump all the blocks that are still used.
  */
-void
+G_GNUC_COLD void
 malloc_close(void)
 {
 #ifdef TRACK_MALLOC

gtk-gnutella-0.97.tar.bz2/src/lib/malloc.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/malloc.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/map.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/map.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/map.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/map.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/mime_type.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/mime_type.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/mime_type.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/mime_type.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/mingw32.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/mingw32.c Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: mingw32.c 19191 2011-05-30 22:18:28Z rmanfredi $
- *
  * Copyright (c) 2010, Jeroen Asselman & Raphael Manfredi
  *
  *----------------------------------------------------------------------
@@ -42,8 +40,6 @@
 
 #ifdef MINGW32
 
-RCSID("$Id: mingw32.c 19191 2011-05-30 22:18:28Z rmanfredi $")
-
 #include <stdlib.h>
 #include <windows.h>
 #include <mswsock.h>
@@ -487,7 +483,7 @@
 /**
  * Synthesize a fatal signal as the kernel would on an exception.
  */
-static void
+static G_GNUC_COLD void
 mingw_sigraise(int signo)
 {
 	g_assert(signo > 0 && signo < SIGNAL_COUNT);
@@ -784,15 +780,25 @@
 	p = is_strprefix(pathname, home);
 	if (p != NULL && !is_directory(pathname)) {
 		char *patched;
-
-		/*
-		 * Put everything under "My Documents/gtk-gnutella", were we should
-		 * already find stdout and stderr files created when running from
-		 * the GUI.
-		 */
-
-		patched = h_strconcat(mingw_getpersonal(),
-			G_DIR_SEPARATOR_S, GTA_PRODUCT_NAME, p, (void *) 0);
+		if (is_strsuffix(pathname, -1, "gtk-gnutella-downloads/complete")) {
+			/* 
+			 * Put the gtk-gnutella-downloads/complete into the downloads folder
+			 * as this is where the user would expect completed downloads to be
+			 * be placed
+			 * 	-- JA 29/7/2011
+			 */
+			patched = h_strdup(
+				g_get_user_special_dir(G_USER_DIRECTORY_DOWNLOAD));
+		} else {
+			/*
+			 * Put everything else under "My Documents/gtk-gnutella", were
+			 * we should already find stdout and stderr files created when
+			 * running from the GUI.
+			 */
+
+			patched = h_strconcat(mingw_getpersonal(),
+				G_DIR_SEPARATOR_S, GTA_PRODUCT_NAME, p, (void *) 0);
+		}
 		s_debug("patched \"%s\" into \"%s\"", pathname, patched);
 		return patched;
 	} else {
@@ -1436,7 +1442,7 @@
 	void *p = NULL;
 
 	if (NULL == hint && mingw_vmm_res_nonhinted >= 0) {
-		if (NULL == mingw_vmm_res_mem) {
+		if G_UNLIKELY(NULL == mingw_vmm_res_mem) {
 			MEMORYSTATUSEX memStatus;
 			SYSTEM_INFO system_info;
 			void *mem_later;
@@ -2285,7 +2291,7 @@
 	struct async_data *ad;
 	
 	if (common_dbg > 2) {
-		t_debug(altc, "%s", G_STRFUNC);
+		g_debug("%s", G_STRFUNC);
 	}	
 	g_assert(req);
 	g_assert(req->common.user_callback);
@@ -2746,7 +2752,7 @@
 /**
  * Convert exception code to string.
  */
-static const char *
+static G_GNUC_COLD const char *
 mingw_exception_to_string(int code)
 {
 	switch (code) {
@@ -2777,7 +2783,7 @@
 /**
  * Log reported exception.
  */
-static void
+static G_GNUC_COLD void
 mingw_exception_log(int code, const void *pc)
 {
 	DECLARE_STR(9);
@@ -2809,7 +2815,7 @@
 /**
  * Log extra information on memory faults.
  */
-static void
+static G_GNUC_COLD void
 mingw_memory_fault_log(const EXCEPTION_RECORD *er)
 {
 	DECLARE_STR(6);
@@ -2852,7 +2858,7 @@
 /**
  * Our default exception handler.
  */
-static LONG WINAPI
+static G_GNUC_COLD LONG WINAPI
 mingw_exception(EXCEPTION_POINTERS *ei)
 {
 	EXCEPTION_RECORD *er;
@@ -3003,7 +3009,7 @@
 	close(STDERR_FILENO);
 }
 
-void
+G_GNUC_COLD void
 mingw_early_init(void)
 {
 	int console_err;

gtk-gnutella-0.97.tar.bz2/src/lib/mingw32.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/mingw32.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/misc.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/misc.c Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: misc.c 19094 2011-05-15 11:18:38Z rmanfredi $
- *
  * Copyright (c) 2001-2008, Raphael Manfredi
  * Copyright (c) 2003-2008, Christian Biere
  *
@@ -38,8 +36,6 @@
 
 #include "common.h"
 
-RCSID("$Id: misc.c 19094 2011-05-15 11:18:38Z rmanfredi $")
-
 #include "ascii.h"
 #include "atoms.h"
 #include "base16.h"
@@ -937,7 +933,7 @@
 /**
  * Initializes the lookup table for hex2int().
  */
-static void
+static G_GNUC_COLD void
 hex2int_init(void)
 {
 	size_t i;
@@ -985,7 +981,7 @@
 /**
  * Initializes the lookup table for dec2int().
  */
-static void
+static G_GNUC_COLD void
 dec2int_init(void)
 {
 	size_t i;
@@ -1021,7 +1017,7 @@
 /**
  * Initializes the lookup table for alnum2int().
  */
-static void
+static G_GNUC_COLD void
 alnum2int_init(void)
 {
 	static const char abc = "0123456789abcdefghijklmnopqrstuvwxyz";
@@ -1110,8 +1106,13 @@
 {
 	g_assert(sha1);
 	if (size > 0) {
-		base32_encode(dst, size, sha1->data, sizeof sha1->data);
-		dstsize - 1 = '\0';
+		size_t len;
+		size_t offset;
+
+		len = base32_encode(dst, size, sha1->data, sizeof sha1->data);
+		g_assert(len <= size);
+		offset = len < size ? len : size - 1;
+		dstoffset = '\0';
 	}
 	return dst;
 }
@@ -1130,6 +1131,45 @@
 	return sha1_to_base32_buf(sha1, digest_b32, sizeof digest_b32);
 }
 
+/**
+ * Convert binary SHA1 into a base16 string.
+ *
+ * @param dst The destination buffer for the string.
+ * @param size The size of "dst" in bytes; should be larger than
+ *             SHA1_BASE16_SIZE, otherwise the resulting string will be
+ *             truncated.
+ * @return dst.
+ */
+char *
+sha1_to_base16_buf(const struct sha1 *sha1, char *dst, size_t size)
+{
+	g_assert(sha1);
+	if (size > 0) {
+		size_t len;
+		size_t offset;
+
+		len = base16_encode(dst, size, sha1->data, sizeof sha1->data);
+		g_assert(len <= size);
+		offset = len < size ? len : size - 1;
+		dstoffset = '\0';
+	}
+	return dst;
+}
+
+/**
+ * Convert binary SHA1 into a base16 string.
+ *
+ * @return pointer to static data.
+ */
+const char *
+sha1_base16(const struct sha1 *sha1)
+{
+	static char digest_b16SHA1_BASE16_SIZE + 1;
+
+	g_assert(sha1);
+	return sha1_to_base16_buf(sha1, digest_b16, sizeof digest_b16);
+}
+
 const char *
 sha1_to_string(const struct sha1 *sha1)
 {
@@ -1331,7 +1371,7 @@
  * @return the number of common leading bits, which is at most
  * min(k1bits, k2bits) if everything matches.
  */
-size_t
+G_GNUC_HOT size_t
 common_leading_bits(
 	gconstpointer k1, size_t k1bits, gconstpointer k2, size_t k2bits)
 {
@@ -1625,7 +1665,7 @@
 /**
  * Find amount of common leading bits between two IP addresses.
  */
-static guint8
+static G_GNUC_HOT guint8
 find_common_leading(guint32 ip1, guint32 ip2)
 {
 	guint8 n;
@@ -1816,7 +1856,7 @@
 
 static GHashTable *html_entities_lut;
 
-static void
+static G_GNUC_COLD void
 html_entities_init(void)
 {
 	size_t i;
@@ -2100,7 +2140,7 @@
 /**
  * Initialize miscellaneous data structures.
  */
-void
+G_GNUC_COLD void
 misc_init(void)
 {
 	hex2int_init();

gtk-gnutella-0.97.tar.bz2/src/lib/misc.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/misc.h Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: misc.h 18970 2011-04-12 18:07:56Z rmanfredi $
- *
  * Copyright (c) 2001-2003, Raphael Manfredi
  *
  *----------------------------------------------------------------------
@@ -64,7 +62,7 @@
 	char strSIZE_FIELD_MAX;
 } short_string_t;
 
-static inline int
+static inline G_GNUC_CONST ALWAYS_INLINE int 
 is_dir_separator(int c)
 {
 	return '/' == c || G_DIR_SEPARATOR == c;
@@ -77,7 +75,7 @@
  * @param x An integer between 0 and 15.
  * @return The ASCII character corresponding to the hex digit 0-9a-f.
  */
-static inline guchar
+static inline G_GNUC_PURE ALWAYS_INLINE guchar
 hex_digit(guchar x)
 {
 	extern const char hex_alphabet_lower;
@@ -154,9 +152,11 @@
 size_t sha1_to_urn_string_buf(const struct sha1 *, char *dst, size_t size);
 char *sha1_to_base32_buf(const struct sha1 *, char *dst, size_t size);
 const char *sha1_base32(const struct sha1 *);
+char *sha1_to_base16_buf(const struct sha1 *, char *dst, size_t size);
+const char *sha1_base16(const struct sha1 *);
 const struct sha1 *base32_sha1(const char *base32);
 
-static inline int
+static inline G_GNUC_PURE int
 sha1_cmp(const struct sha1 *a, const struct sha1 *b)
 {
 	return memcmp(a, b, SHA1_RAW_SIZE);
@@ -264,7 +264,8 @@
 gboolean is_printable_iso8859_string(const char *s);
 void locale_strlower(char *, const char *);
 size_t common_leading_bits(
-	gconstpointer k1, size_t k1bits, gconstpointer k2, size_t k2bits);
+	gconstpointer k1, size_t k1bits, gconstpointer k2, size_t k2bits)
+	G_GNUC_PURE;
 float force_range(float value, float min, float max);
 const char *short_filename(const char *fullname);
 char *data_hex_str(const char *data, size_t len);
@@ -509,11 +510,11 @@
  */
 static inline G_GNUC_CONST WARN_UNUSED_RESULT guint8
 netmask_to_cidr(guint32 netmask)
-#ifdef HAVE_BUILTIN_POPCOUNT
+#ifdef HAS_BUILTIN_POPCOUNT
 {
-	__builtin_popcount(netmask);
+	return __builtin_popcount(netmask);
 }
-#else	/* HAVE_BUILTIN_POPCOUNT */
+#else	/* !HAS_BUILTIN_POPCOUNT */
 {
 	guint8 bits = 32;
 
@@ -523,7 +524,7 @@
 	}
 	return bits;
 }
-#endif /* HAVE_BUILTIN_POPCOUNT */
+#endif /* HAS_BUILTIN_POPCOUNT */
 
 /**
  * Converts the CIDR prefix length to a IPv4 netmask in host byte order.

gtk-gnutella-0.97.tar.bz2/src/lib/nid.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/nid.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/nid.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/nid.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/nv.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/nv.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/nv.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/nv.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/offtime.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/offtime.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/offtime.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/offtime.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/ohash_table.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/ohash_table.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/ohash_table.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/ohash_table.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/omalloc.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/omalloc.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/omalloc.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/omalloc.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/options.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/options.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/options.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/options.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/ostream.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/ostream.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/ostream.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/ostream.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/override.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/override.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/pagetable.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/pagetable.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/pagetable.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/pagetable.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/palloc.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/palloc.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/palloc.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/palloc.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/parse.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/parse.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/parse.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/parse.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/path.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/path.c Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: path.c 18596 2011-01-30 21:12:45Z rmanfredi $
- *
  * Copyright (c) 2009, Raphael Manfredi
  * Copyright (c) 2006-2008, Christian Biere
  *
@@ -38,8 +36,6 @@
 
 #include "common.h"
 
-RCSID("$Id: path.c 18596 2011-01-30 21:12:45Z rmanfredi $")
-
 #include "ascii.h"
 #include "path.h"
 #include "misc.h"
@@ -231,4 +227,43 @@
 	return dir;
 }
 
+/**
+ * Compute special folder path.
+ *
+ * @param which_folder		the special folder token
+ * @param path				sub-path undernead the special folder
+ *
+ * @return halloc()'ed full path, NULL if special folder is unknown.
+ */
+char *
+get_folder_path(enum special_folder which_folder, const char *path)
+{
+	char *pathname;
+	size_t offset = 0;	
+	char *special_path = NULL;
+
+	switch (which_folder) {
+	case PRIVLIB_PATH:	special_path = getenv("XDG_DATA_DIRS"); break;
+	}
+	
+	if (NULL == special_path)
+		return NULL;
+	
+	pathname = halloc0(MAX_PATH_LEN);
+			
+	offset += clamp_strcpy(
+		&pathnameoffset, MAX_PATH_LEN - offset, special_path);
+		
+	offset += clamp_strcpy(
+		&pathnameoffset, MAX_PATH_LEN - offset, 
+			G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S);
+
+	if (path != NULL) {
+		offset += clamp_strcpy(
+			&pathnameoffset, MAX_PATH_LEN - offset, path);
+	}
+	
+	return pathname;
+}
+
 /* vi: set ts=4 sw=4 cindent: */

gtk-gnutella-0.97.tar.bz2/src/lib/path.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/path.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/patricia.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/patricia.c Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: patricia.c 19142 2011-05-23 20:44:04Z rmanfredi $
- *
  * Copyright (c) 2008, Raphael Manfredi
  *
  *----------------------------------------------------------------------
@@ -145,8 +143,6 @@
 
 #include "common.h"
 
-RCSID("$Id: patricia.c 19142 2011-05-23 20:44:04Z rmanfredi $")
-
 #include "patricia.h"
 #include "endian.h"
 #include "glib-missing.h"
@@ -504,7 +500,7 @@
 /**
  * Number of bits for the node's prefix.
  */
-static inline size_t
+static inline G_GNUC_PURE size_t
 node_prefix_bits(const struct patricia_node *pn)
 {
 	patricia_node_check(pn);
@@ -515,7 +511,7 @@
 /**
  * Whether node holds data.
  */
-static inline gboolean
+static inline G_GNUC_PURE gboolean
 node_has_data(const struct patricia_node *pn)
 {
 	patricia_node_check(pn);
@@ -526,7 +522,7 @@
 /**
  * The key of the data held in the node.
  */
-static inline gconstpointer
+static inline G_GNUC_PURE gconstpointer
 node_key(const struct patricia_node *pn)
 {
 	patricia_node_check(pn);
@@ -542,7 +538,7 @@
 /**
  * The key size in bits of the data held in the node.
  */
-static inline size_t
+static inline G_GNUC_PURE size_t
 node_keybits(const struct patricia_node *pn)
 {
 	patricia_node_check(pn);
@@ -558,7 +554,7 @@
 /**
  * The value of the data held in the node.
  */
-static inline gconstpointer
+static inline G_GNUC_PURE gconstpointer
 node_value(const struct patricia_node *pn)
 {
 	patricia_node_check(pn);
@@ -574,7 +570,7 @@
 /**
  * Is the current node test bit matched by the key?
  */
-static inline gboolean
+static inline G_GNUC_PURE gboolean
 node_matches(const struct patricia_node *pn, gconstpointer key, size_t keybits)
 {
 	const guint8 *k = key;
@@ -595,7 +591,7 @@
  *
  * @return TRUE if keys are identical.
  */
-static gboolean
+static gboolean G_GNUC_PURE
 key_eq(gconstpointer k1, gconstpointer k2, size_t keybits)
 {
 	size_t bytes;			/* Amount of bytes to compare */
@@ -661,7 +657,7 @@
  * of matching leading bits within the key can be determined by calling
  * matched_bits() on the resulting node).
  */
-static struct patricia_node *
+static G_GNUC_HOT struct patricia_node *
 match_best(patricia_t *pt, gconstpointer key, size_t keybits)
 {
 	const struct patricia_node *pn;
@@ -712,7 +708,7 @@
  *
  * @return the node which is an exact match, or NULL if not found.
  */
-static const struct patricia_node *
+static G_GNUC_HOT const struct patricia_node *
 match_exact(const patricia_t *pt, gconstpointer key, size_t keybits)
 {
 	const struct patricia_node *pn;
@@ -2626,7 +2622,7 @@
 	return (p3 & 0x1) ? TRUE : FALSE;
 }
 
-static void
+static G_GNUC_COLD void
 test_keys(guint32 keys, size_t nkeys)
 {
 	size_t i;
@@ -2858,7 +2854,7 @@
 /**
  * Perform unit tests of PATRICIA trees.
  */
-void
+G_GNUC_COLD void
 patricia_test(void)
 {
 	size_t i;

gtk-gnutella-0.97.tar.bz2/src/lib/patricia.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/patricia.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/pattern.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/pattern.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/pattern.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/pattern.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/pmsg.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/pmsg.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/pmsg.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/pmsg.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/pow2.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/pow2.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/pow2.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/pow2.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/prop.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/prop.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/prop.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/prop.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/random.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/random.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/random.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/random.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/sbool.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/sbool.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/sectoken.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/sectoken.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/sectoken.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/sectoken.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/sequence.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/sequence.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/sequence.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/sequence.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/sha1.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/sha1.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/sha1.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/sha1.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/signal.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/signal.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/signal.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/signal.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/slist.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/slist.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/slist.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/slist.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/sorted_array.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/sorted_array.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/sorted_array.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/sorted_array.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/stacktrace.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/stacktrace.c Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: stacktrace.c 19325 2011-07-07 12:48:24Z rmanfredi $
- *
  * Copyright (c) 2004, 2010, Raphael Manfredi
  *
  *----------------------------------------------------------------------
@@ -43,8 +41,6 @@
 
 #include "common.h"		/* For RCSID */
 
-RCSID("$Id: stacktrace.c 19325 2011-07-07 12:48:24Z rmanfredi $")
-
 #include "stacktrace.h"
 #include "atoms.h"		/* For binary_hash() */
 #include "ascii.h"
@@ -283,7 +279,7 @@
 /**
  * Sort trace array, remove duplicate entries.
  */
-static void
+static G_GNUC_COLD void
 trace_sort(void)
 {
 	size_t i = 0;
@@ -434,7 +430,7 @@
  * @return symbolic name for given pc offset, if found, otherwise
  * the hexadecimal value.
  */
-static const char *
+static G_GNUC_COLD const char *
 trace_name(const void *pc, gboolean offset)
 {
 	static char buf256;
@@ -769,7 +765,7 @@
  * limitation is that we cannot know which symbols are correct, so all symbols
  * will be flagged as doubtful when we detect the slightest inconsistency.
  */
-static void
+static G_GNUC_COLD void
 load_symbols(const char *path, const  char *lpath)
 {
 	char tmpMAX_PATH_LEN + 80;
@@ -867,7 +863,7 @@
  * @return a newly allocated string (through halloc()) that points to the
  * path of the program being run, NULL if we can't compute a suitable path.
  */
-static char *
+static G_GNUC_COLD char *
 program_path_allocate(const char *argv0)
 {
 	filestat_t buf;
@@ -917,7 +913,7 @@
 /**
  * Tune the level of offsetting we have to do to get the current caller.
  */
-static NO_INLINE void
+static G_GNUC_COLD NO_INLINE void
 stacktrace_auto_tune(void)
 {
 	void *stackSTACKTRACE_DEPTH_MAX;
@@ -957,7 +953,7 @@
  * @param argv0		the value of argv0, from main(): the program's filename
  * @param deferred	if TRUE, do not load symbols until it's needed
  */
-void
+G_GNUC_COLD void
 stacktrace_init(const char *argv0, gboolean deferred)
 {
 	char *path;
@@ -1017,7 +1013,7 @@
 /**
  * Close stack tracing.
  */
-void
+G_GNUC_COLD void
 stacktrace_close(void)
 {
 	HFREE_NULL(local_path);
@@ -1036,7 +1032,7 @@
 /**
  * Load symbols if not done already.
  */
-void
+G_GNUC_COLD void
 stacktrace_load_symbols(void)
 {
 	if (symbols_loaded)
@@ -1399,7 +1395,7 @@
 /**
  * Invoked when a fatal signal is received during stack unwinding.
  */
-static void
+static G_GNUC_COLD void
 stacktrace_got_signal(int signo)
 {
 	DECLARE_STR(4);
@@ -1427,7 +1423,7 @@
  * @param fd		file descriptor where stack should be printed
  * @param offset	amount of immediate callers to remove (ourselves excluded)
  */
-void
+G_GNUC_COLD void
 stacktrace_where_cautious_print_offset(int fd, size_t offset)
 {
 	void *stackSTACKTRACE_DEPTH_MAX + 5;	/* See stacktrace_unwind() */

gtk-gnutella-0.97.tar.bz2/src/lib/stacktrace.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/stacktrace.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/stats.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/stats.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/stats.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/stats.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/str.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/str.c Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: str.c 19265 2011-06-15 14:56:20Z rmanfredi $
- *
  * Copyright (c) 1996-2000, 2007, 2010 Raphael Manfredi
  *
  * This code given by Raphael Manfredi, extracted from his fm2html package.
@@ -43,8 +41,6 @@
 
 #include "common.h"
 
-RCSID("$Id: str.c 19265 2011-06-15 14:56:20Z rmanfredi $")
-
 #include <math.h>		/* For frexp() and isfinite() */
 
 #include "ascii.h"
@@ -1173,7 +1169,6 @@
 	str_check(str);
 	g_assert(size_is_non_negative(maxlen));
 	g_assert(fmt != NULL);
-	g_assert(args != NULL);
 
 	fmtlen = strlen(fmt);
 	origlen = str->s_len;
@@ -1201,13 +1196,11 @@
 		return 0;
 
 	if (2 == fmtlen && fmt0 == '%' && fmt1 == 's') {
-		if (args) {
-			const char *s = va_arg(args, char*);
-			size_t len;
-			s = s ? s : nullstr;
-			len = strlen(s);
-			str_ncat_foreign(str, s, len > maxlen ? maxlen : len);
-		}
+		const char *s = va_arg(args, char*);
+		size_t len;
+		s = s ? s : nullstr;
+		len = strlen(s);
+		str_ncat_foreign(str, s, len > maxlen ? maxlen : len);
 		goto done;
 	}
 
@@ -1306,7 +1299,7 @@
 
 		case '*':
 			{
-				int i = args ? va_arg(args, int) : 0;
+				int i = va_arg(args, int);
 				left |= (i < 0);
 				width = (i < 0) ? -UNSIGNED(i) : UNSIGNED(i);
 				q++;
@@ -1319,7 +1312,7 @@
 		if (*q == '.') {
 			q++;
 			if (*q == '*') {
-				int i = args ? va_arg(args, int) : 0;
+				int i = va_arg(args, int);
 				precis = (i < 0) ? 0 : i;
 				q++;
 			} else {
@@ -1354,25 +1347,20 @@
 			goto string;
 
 		case 'c':
-			if (args)
-				c = va_arg(args, int) & MAX_INT_VAL(unsigned char);
-			else
-				c = 0;
+			c = va_arg(args, int) & MAX_INT_VAL(unsigned char);
 			eptr = &c;
 			elen = 1;
 			goto string;
 
 		case 's':
-			if (args) {
-				eptr = va_arg(args, char*);
-				if (NULL == eptr)
-					eptr = nullstr;
-				if (has_precis) {
-					/* String may not be NUL-terminated */
-					elen = clamp_strlen(eptr, precis);
-				} else {
-					elen = strlen(eptr);
-				}
+			eptr = va_arg(args, char*);
+			if (NULL == eptr)
+				eptr = nullstr;
+			if (has_precis) {
+				/* String may not be NUL-terminated */
+				elen = clamp_strlen(eptr, precis);
+			} else {
+				elen = strlen(eptr);
 			}
 
 		string:
@@ -1383,10 +1371,7 @@
 			/* INTEGERS */
 
 		case 'p':
-			if (args)
-				uv = (unsigned long) va_arg(args, void*);
-			else
-				uv = 0;
+			uv = (unsigned long) va_arg(args, void*);
 			base = 16;
 			c = 'x';		/* Request lower-cased pointer */
 			goto integer;
@@ -1396,15 +1381,10 @@
 			/* FALL THROUGH */
 		case 'd':
 		case 'i':
-			if (args) {
-				switch (intsize) {
-				case 'h':		iv = (short) va_arg(args, int); break;
-				default:		iv = va_arg(args, int); break;
-				case 'l':		iv = va_arg(args, long); break;
-				}
-			}
-			else {
-				iv = 0;
+			switch (intsize) {
+			case 'h':		iv = (short) va_arg(args, int); break;
+			case 'l':		iv = va_arg(args, long); break;
+			default:		iv = va_arg(args, int); break;
 			}
 			if (iv >= 0) {
 				uv = iv;
@@ -1437,17 +1417,14 @@
 			base = 16;
 
 		uns_integer:
-			if (args) {
-				switch (intsize) {
-				case 'h':  uv = (unsigned short) va_arg(args, unsigned); break;
-				case 'l':  uv = va_arg(args, unsigned long); break;
-				default:   uv = va_arg(args, unsigned); break;
-				}
-			}
-			else {
-				uv = 0;
+			switch (intsize) {
+			case 'h':  uv = (unsigned short) va_arg(args, unsigned); break;
+			case 'l':  uv = va_arg(args, unsigned long); break;
+			default:   uv = va_arg(args, unsigned); break;
 			}
 
+		/* FALL THROUGH */
+
 		integer:
 			mptr = ebuf + sizeof ebuf;
 			switch (base) {
@@ -1502,10 +1479,7 @@
 			 * Formatting of floats is delegated to system's snprintf().
 			 */
 
-			if (args)
-				nv = va_arg(args, double);
-			else
-				nv = 0.0;
+			nv = va_arg(args, double);
 
 			/*
 			 * Ensure nv is a valid number, and not NaN, +Inf or -Inf,
@@ -1565,7 +1539,7 @@
 			/* SPECIAL */
 
 		case 'n':
-			if (args) {
+			{
 				size_t n = str->s_len - origlen;
 				switch (intsize) {
 				case 'h': *(va_arg(args, short*)) = MIN(n, SHRT_MAX); break;

gtk-gnutella-0.97.tar.bz2/src/lib/str.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/str.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/stringify.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/stringify.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/stringify.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/stringify.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/strtok.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/strtok.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/strtok.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/strtok.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/symtab.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/symtab.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/symtab.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/symtab.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/tea.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/tea.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/tea.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/tea.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/tiger.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/tiger.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/tiger.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/tiger.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/tiger_sboxes.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/tiger_sboxes.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/tigertree.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/tigertree.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/tigertree.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/tigertree.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/timestamp.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/timestamp.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/timestamp.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/timestamp.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/tm.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/tm.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/tm.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/tm.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/unsigned.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/unsigned.h Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: unsigned.h 18643 2011-02-05 17:43:15Z rmanfredi $
- *
  * Copyright (c) 2008-2009, Raphael Manfredi
  * Copyright (c) 2006-2008, Christian Biere
  *
@@ -53,7 +51,7 @@
  * @return TRUE if size is equal to zero or larger and smaller than
  *         SIZE_MAX / 2.
  */
-static inline gboolean
+static inline G_GNUC_CONST ALWAYS_INLINE gboolean
 size_is_non_negative(size_t size)
 {
 	return size <= SIZE_MAX / 2;
@@ -63,7 +61,7 @@
  * Check whether a signed representation of size would be strictly positive.
  * @return TRUE if size is larger than zero and smaller than SIZE_MAX / 2.
  */
-static inline gboolean
+static inline G_GNUC_CONST ALWAYS_INLINE gboolean
 size_is_positive(size_t size)
 {
 	return size_is_non_negative(size - 1);
@@ -73,7 +71,7 @@
  * Calculate the sum of a and b but saturate towards SIZE_MAX.
  * @return SIZE_MAX if a + b > SIZE_MAX, otherwise a + b.
  */
-static inline size_t
+static inline G_GNUC_CONST size_t
 size_saturate_add(size_t a, size_t b)
 {
 	size_t ret = a + b;
@@ -86,7 +84,7 @@
  * Calculate the product of a and b but saturate towards SIZE_MAX.
  * @return SIZE_MAX if a * b > SIZE_MAX, otherwise a * b.
  */
-static inline size_t
+static inline G_GNUC_CONST size_t
 size_saturate_mult(size_t a, size_t b)
 {
 	if (0 == a)
@@ -100,7 +98,7 @@
  * Calculate the difference between a and b but saturate towards zero.
  * @return zero if a < b, otherwise a - b.
  */
-static inline size_t
+static inline G_GNUC_CONST size_t
 size_saturate_sub(size_t a, size_t b)
 {
 	if (G_UNLIKELY(a < b))
@@ -113,7 +111,7 @@
  * @return TRUE if size is greater than or equal to zero, yet smaller than the
  * maximum positive quantity that can be represented.
  */
-static inline gboolean
+static inline G_GNUC_CONST ALWAYS_INLINE gboolean
 uint_is_non_negative(unsigned v)
 {
 	return v <= MAX_INT_VAL(unsigned) / 2;
@@ -124,7 +122,7 @@
  * @return TRUE if size is stricly larger than zero, yet smaller than the
  * maximum positive quantity that can be represented.
  */
-static inline gboolean
+static inline G_GNUC_CONST ALWAYS_INLINE gboolean
 uint_is_positive(unsigned v)
 {
 	return uint_is_non_negative(v - 1);
@@ -134,7 +132,7 @@
  * Calculate the sum of a and b but saturate towards the maximum value.
  * @return maximum if a + b > maximum, otherwise a + b.
  */
-static inline unsigned
+static inline G_GNUC_CONST unsigned
 uint_saturate_add(unsigned a, unsigned b)
 {
 	unsigned ret = a + b;
@@ -147,7 +145,7 @@
  * Calculate the product of a and b but saturate towards UINT_MAX.
  * @return UINT_MAX if a * b > UINT_MAX, otherwise a * b.
  */
-static inline unsigned
+static inline G_GNUC_CONST unsigned
 uint_saturate_mult(unsigned a, unsigned b)
 {
 	if (0 == a)
@@ -161,7 +159,7 @@
  * Calculate the sum of a and b but saturate towards the maximum value.
  * @return maximum if a + b > maximum, otherwise a + b.
  */
-static inline guint64
+static inline G_GNUC_CONST guint64
 guint64_saturate_add(guint64 a, guint64 b)
 {
 	guint64 ret = a + b;
@@ -174,7 +172,7 @@
  * Calculate the product of a and b but saturate towards MAX_UINT64.
  * @return MAX_UINT64 if a * b > MAX_UINT64, otherwise a * b.
  */
-static inline guint64
+static inline G_GNUC_CONST guint64
 guint64_saturate_mult(guint64 a, guint64 b)
 {
 	if (0 == a)
@@ -188,7 +186,7 @@
  * Calculate the sum of a and b but saturate towards the maximum value.
  * @return maximum if a + b > maximum, otherwise a + b.
  */
-static inline guint32
+static inline G_GNUC_CONST guint32
 guint32_saturate_add(guint32 a, guint32 b)
 {
 	guint32 ret = a + b;
@@ -201,7 +199,7 @@
  * Calculate the product of a and b but saturate towards MAX_UINT32.
  * @return MAX_UINT32 if a * b > MAX_UINT32, otherwise a * b.
  */
-static inline guint32
+static inline G_GNUC_CONST guint32
 guint32_saturate_mult(guint32 a, guint32 b)
 {
 	if (0 == a)
@@ -216,7 +214,7 @@
  * @return TRUE if size is greater than or equal to zero, yet smaller than the
  * maximum positive quantity that can be represented.
  */
-static inline gboolean
+static inline G_GNUC_CONST ALWAYS_INLINE gboolean
 guint32_is_non_negative(guint32 v)
 {
 	return v <= MAX_INT_VAL(guint32) / 2;
@@ -227,7 +225,7 @@
  * @return TRUE if size is stricly larger than zero, yet smaller than the
  * maximum positive quantity that can be represented.
  */
-static inline gboolean
+static inline G_GNUC_CONST ALWAYS_INLINE gboolean
 guint32_is_positive(guint32 v)
 {
 	return guint32_is_non_negative(v - 1);
@@ -237,7 +235,7 @@
  * Calculate the sum of a and b but saturate towards the maximum value.
  * @return maximum if a + b > maximum, otherwise a + b.
  */
-static inline guint8
+static inline G_GNUC_CONST guint8
 guint8_saturate_add(guint8 a, guint8 b)
 {
 	guint8 ret = a + b;

gtk-gnutella-0.97.tar.bz2/src/lib/url.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/url.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/url.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/url.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/url_factory.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/url_factory.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/url_factory.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/url_factory.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/urn.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/urn.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/urn.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/urn.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/utf8.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/utf8.c Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: utf8.c 19175 2011-05-26 22:50:21Z rmanfredi $
- *
  * Copyright (c) 2002-2003, 2010, Raphael Manfredi
  * Copyright (c) 2004-2006, Christian Biere
  *
@@ -41,8 +39,6 @@
 
 #include "common.h"
 
-RCSID("$Id: utf8.c 19175 2011-05-26 22:50:21Z rmanfredi $")
-
 #ifdef ENABLE_NLS
 #include <libintl.h>
 #endif /* ENABLE_NLS */
@@ -276,7 +272,7 @@
 	return t->is_utf8;
 }
 
-static inline G_GNUC_CONST guint
+static inline G_GNUC_PURE guint
 utf8_skip(guchar c)
 {
 	/*
@@ -804,7 +800,7 @@
  * If `s' does not point to a well-formed UTF-8 character, `retlen' is
  * set to 0 and the function returns 0.
  */
-guint32
+G_GNUC_HOT guint32
 utf8_decode_char_fast(const char *s, guint *retlen)
 {
 	guint32 uc = (guchar) *s;
@@ -1602,7 +1598,7 @@
  * 			used character sets. The first is the one that should be
  *			used when creating files.
  */
-static GSList *
+static G_GNUC_COLD GSList *
 get_filename_charsets(const char *locale)
 {
 	const char *s, *next;
@@ -1716,7 +1712,7 @@
 	}
 }
 
-static void
+static G_GNUC_COLD void
 conversion_init(void)
 {
 	const char *pfcs = primary_filename_charset();
@@ -1797,7 +1793,7 @@
 	gm_hash_table_destroy_null(&charset2conv_to_utf8);
 }
 
-void
+G_GNUC_COLD void
 locale_init(void)
 {
 	static const char * const latin_sets = {
@@ -1907,7 +1903,7 @@
 /**
  * Called at shutdown time.
  */
-void
+G_GNUC_COLD void
 locale_close(void)
 {
 #if 0   /* xxxUSE_ICU */
@@ -3534,7 +3530,7 @@
  *
  * @return the lowercase variant of ``uc'' or ``uc'' itself.
  */
-guint32
+G_GNUC_HOT guint32
 utf32_lowercase(guint32 uc)
 {
 	if (uc < 0x80)
@@ -5545,7 +5541,7 @@
 		g_hash_table_insert(utf32_compose_roots, key, new_sl);
 }
 
-static void
+static G_GNUC_COLD void
 unicode_compose_init(void)
 {
 	size_t i;
@@ -5813,7 +5809,7 @@
  * Checks all cases listed in NormalizationTest.txt. This does not take
  * very long but the table is pretty huge.
  */
-static void
+static G_GNUC_COLD void
 regression_normalization_test_txt(void)
 {
 	size_t i;
@@ -5969,7 +5965,7 @@
  *
  * X == NFC(X) == NFD(X) == NFKC(X) == NFKD(X)
  */
-static void
+static G_GNUC_COLD void
 regression_normalization_character_identity(void)
 {
 	size_t i;
@@ -6000,7 +5996,7 @@
 /**
  * See: http://www.unicode.org/review/pr-29.html
  */
-static void
+static G_GNUC_COLD void
 regression_normalization_issue(void)
 {
 	static const struct {
@@ -6029,7 +6025,7 @@
 	}
 }
 
-static void
+static G_GNUC_COLD void
 regression_utf8_strlower(void)
 {
 	{
@@ -6107,7 +6103,7 @@
  * Verify that each UTF-8 encoded codepoint is decoded to the same
  * codepoint.
  */
-static void
+static G_GNUC_COLD void
 regression_utf8_bijection(void)
 {
 	guint32 uc;
@@ -6162,7 +6158,7 @@
  * Check utf8_decode_char_fast() for all 4-byte combinations. This
  * takes about 3 minutes of CPU time on an Athlon Duron 1.4GHz.
  */
-static void
+static G_GNUC_COLD void
 regression_utf8_decoder(void)
 {
 	guint32 uc = 0;
@@ -6202,7 +6198,7 @@
  * The following checks are broken as GLib does not implement Unicode 4.1.0
  * at the moment. --cbiere, 2005-08-02
  */
-static void
+static G_GNUC_COLD void
 regression_utf8_vs_glib2(void)
 {
 #if defined(USE_GLIB2)
@@ -6678,7 +6674,7 @@
 	printf(" PASSED\n"); \
 } G_STMT_END
 
-void
+G_GNUC_COLD void
 utf8_regression_checks(void)
 {
 	/* unicode_compose_init() must be called before this */

gtk-gnutella-0.97.tar.bz2/src/lib/utf8.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/utf8.h Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: utf8.h 19179 2011-05-27 15:56:37Z rmanfredi $
- *
  * Copyright (c) 2002-2003, Raphael Manfredi
  *
  *----------------------------------------------------------------------
@@ -102,7 +100,7 @@
 char *utf16_to_utf8_string(const guint16 *in);
 
 size_t utf32_to_utf8(const guint32 *in, char *out, size_t size);
-guint32 utf32_lowercase(guint32 uc);
+guint32 utf32_lowercase(guint32 uc) G_GNUC_PURE;
 gboolean utf32_canonical_sorted(const guint32 *src);
 gboolean utf32_is_decomposed(const guint32 *src, gboolean nfkd);
 size_t utf32_decompose_nfd(const guint32 *in, guint32 *out, size_t size);
@@ -223,7 +221,7 @@
 		utf32_is_surrogate(uc);
 }
 
-static inline unsigned
+static inline G_GNUC_CONST unsigned
 utf8_encoded_len(guint32 cp)
 {
   if (cp < 0x80U) {
@@ -239,13 +237,13 @@
   }
 }
 
-static inline gboolean
+static inline G_GNUC_CONST gboolean
 utf32_is_ascii(guint32 cp)
 {
   return cp < 0x80U;
 }
 
-static inline unsigned
+static inline G_GNUC_CONST unsigned
 utf8_first_byte_length_hint(unsigned char ch)
 {
   switch (ch & ~0x0fU) {
@@ -265,13 +263,13 @@
   }
 }
 
-static inline gboolean
+static inline G_GNUC_CONST gboolean
 utf8_first_byte_valid(unsigned char ch)
 {
   return 0 != utf8_first_byte_length_hint(ch);
 }
 
-static inline gboolean
+static inline G_GNUC_CONST gboolean
 utf8_first_bytes_valid(unsigned char ch1, unsigned char ch2)
 {
   if (ch1 < 0x80) {

gtk-gnutella-0.97.tar.bz2/src/lib/utf8_tables.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/utf8_tables.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/vector.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/vector.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/vector.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/vector.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/vendors.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/vendors.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/vendors.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/vendors.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/vmm.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/vmm.c Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: vmm.c 19325 2011-07-07 12:48:24Z rmanfredi $
- *
  * Copyright (c) 2006, Christian Biere
  * Copyright (c) 2006, 2009, Raphael Manfredi
  *
@@ -92,8 +90,6 @@
 
 #include "common.h"
 
-RCSID("$Id: vmm.c 19325 2011-07-07 12:48:24Z rmanfredi $")
-
 #define VMM_SOURCE
 #include "vmm.h"
 
@@ -227,7 +223,7 @@
 #endif
 
 
-static inline gboolean
+static inline G_GNUC_PURE gboolean
 vmm_debugging(guint32 lvl)
 {
 	return safe_to_log && vmm_debug > lvl;
@@ -264,7 +260,7 @@
 /**
  * Fast version of pagesize rounding (without the slow % operator).
  */
-static inline size_t
+static inline ALWAYS_INLINE size_t G_GNUC_PURE
 round_pagesize_fast(size_t n)
 {
 	return (n + kernel_pagemask) & ~kernel_pagemask;
@@ -273,7 +269,7 @@
 /**
  * Fast version of page counting: how many pages does it take to store `n'?
  */
-static inline size_t
+static inline ALWAYS_INLINE size_t G_GNUC_PURE
 pagecount_fast(size_t n)
 {
 	return round_pagesize_fast(n) >> kernel_pageshift;
@@ -347,7 +343,7 @@
 /**
  * @return whether fragment is identified as foreign.
  */
-static inline gboolean
+static inline ALWAYS_INLINE gboolean
 vmf_is_foreign(const struct vm_fragment *vmf)
 {
 	return booleanize((pointer_to_ulong(vmf->end) & 0x1));
@@ -363,7 +359,7 @@
 /**
  * @return first byte after the end of a fragment.
  */
-static inline const void *
+static inline ALWAYS_INLINE const void *
 vmf_end(const struct vm_fragment *vmf)
 {
 	return vmf_is_foreign(vmf) ? const_ptr_add_offset(vmf->end, 1) : vmf->end;
@@ -372,7 +368,7 @@
 /**
  * @return size of a memory fragment.
  */
-static inline size_t
+static inline ALWAYS_INLINE size_t
 vmf_size(const struct vm_fragment *vmf)
 {
 	return ptr_diff(vmf_end(vmf), vmf->start);
@@ -472,7 +468,7 @@
  * Compute the size of the first hole at the base of the VM space and return
  * its location in ``hole_ptr'', if we find one with a non-zero length.
  */
-static size_t
+static G_GNUC_HOT size_t
 vmm_first_hole(const void **hole_ptr)
 {
 	struct pmap *pm = vmm_pmap();
@@ -900,7 +896,7 @@
  * @return found fragment if address lies within the fragment, NULL if
  * no fragment containing the address was found.
  */
-static struct vm_fragment *
+static G_GNUC_HOT struct vm_fragment *
 pmap_lookup(const struct pmap *pm, const void *p, size_t *low_ptr)
 {
 	size_t low = 0, high = pm->count - 1;
@@ -3185,7 +3181,7 @@
  * region and reserve an extra VMM_STACK_MINSIZE bytes for it to grow
  * further.
  */
-static void
+static G_GNUC_COLD void
 vmm_reserve_stack(size_t amount)
 {
 	const void *stack_base, *stack_end, *stack_low;
@@ -3310,7 +3306,7 @@
  * Called later in the initialization chain once the callout queue has been
  * initialized and the properties loaded.
  */
-void
+G_GNUC_COLD void
 vmm_post_init(void)
 {
 	struct {
@@ -3433,7 +3429,7 @@
  * No external memory allocation (malloc() and friends) can be done in this
  * routine, which is called very early at startup.
  */
-void
+G_GNUC_COLD void
 vmm_init(const void *sp)
 {
 	int i;

gtk-gnutella-0.97.tar.bz2/src/lib/vmm.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/vmm.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/walloc.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/walloc.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/walloc.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/walloc.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/watcher.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/watcher.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/watcher.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/watcher.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/wd.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/wd.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/wd.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/wd.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/wordvec.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/wordvec.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/wordvec.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/wordvec.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/wq.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/wq.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/wq.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/wq.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/zalloc.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/zalloc.c Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: zalloc.c 19325 2011-07-07 12:48:24Z rmanfredi $
- *
  * Copyright (c) 2002-2003, 2009-2010 Raphael Manfredi
  *
  *----------------------------------------------------------------------
@@ -58,8 +56,6 @@
 
 #include "common.h"
 
-RCSID("$Id: zalloc.c 19325 2011-07-07 12:48:24Z rmanfredi $")
-
 #include "zalloc.h"
 #include "hashtable.h"
 #include "glib-missing.h"	/* For g_mem_is_system_malloc() */
@@ -306,7 +302,7 @@
  * @return a pointer to a block containing at least 'size' bytes of
  * memory.  It is a fatal error if memory cannot be allocated.
  */
-void *
+G_GNUC_HOT void *
 zalloc(zone_t *zone)
 {
 	char **blk;		/**< Allocated block */
@@ -1050,7 +1046,7 @@
  * Close the zone allocator, destroying all the remaining zones regardless
  * of their reference count.
  */
-void
+G_GNUC_COLD void
 zclose(void)
 {
 	if (NULL == zt)
@@ -1176,7 +1172,7 @@
  *
  * @return a pointer to the found subzone information, NULL if not found.
  */
-static struct subzinfo *
+static G_GNUC_HOT struct subzinfo *
 zgc_find_subzone(struct zone_gc *zg, void *blk, unsigned *low_ptr)
 {
 	struct subzinfo *item, *array = zg->zg_subzinfo;
@@ -1214,7 +1210,7 @@
 /**
  * Check whether address falls within the subzone boundaries.
  */
-static inline gboolean
+static inline G_GNUC_HOT gboolean
 zgc_within_subzone(const struct subzinfo *szi, const void *p)
 {
 	struct subzone *sz;
@@ -1930,7 +1926,7 @@
 /**
  * Allocate a block from the first subzone with free items.
  */
-static void *
+static G_GNUC_HOT void *
 zgc_zalloc(zone_t *zone)
 {
 	struct zone_gc *zg = zone->zn_gc;
@@ -2280,7 +2276,7 @@
 /**
  * Initialize zone allocator.
  */
-void
+G_GNUC_COLD void
 zinit(void)
 {
 	addr_grows_upwards = vmm_grows_upwards();

gtk-gnutella-0.97.tar.bz2/src/lib/zalloc.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/zalloc.h Changed

gtk-gnutella-0.97.tar.bz2/src/lib/zlib_util.c -> gtk-gnutella-0.97.1.tar.bz2/src/lib/zlib_util.c Changed

gtk-gnutella-0.97.tar.bz2/src/lib/zlib_util.h -> gtk-gnutella-0.97.1.tar.bz2/src/lib/zlib_util.h Changed

gtk-gnutella-0.97.tar.bz2/src/main.c -> gtk-gnutella-0.97.1.tar.bz2/src/main.c Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: main.c 19325 2011-07-07 12:48:24Z rmanfredi $
- *
  * Copyright (c) 2001-2003, Raphael Manfredi
  *
  *----------------------------------------------------------------------
@@ -166,8 +164,6 @@
 
 #include "lib/override.h"		/* Must be the last header included */
 
-RCSID("$Id: main.c 19325 2011-07-07 12:48:24Z rmanfredi $")
-
 #define SLOW_UPDATE_PERIOD		20	/**< Update period for `main_slow_update' */
 #define EXIT_GRACE				30	/**< Seconds to wait before exiting */
 #define ATEXIT_TIMEOUT			20	/**< Final cleanup must not take longer */
@@ -267,6 +263,39 @@
 }
 
 /**
+ * Get full build number string.
+ */
+const char *
+main_get_build_full(void)
+{
+	static char *result;
+
+	if (NULL == result) {
+		const char *p;
+		p = is_strprefix(GTA_BUILD, "$Revision: ");
+		if (p != NULL) {
+			char *tmp;
+			char *q;
+			size_t len = strlen(p) + 2;		/* Leading '-', trailing NUL */
+
+			tmp = halloc(len);
+			g_strlcpy(tmp + 1, p, len - 1);
+			*tmp = '-';
+			q = strchr(tmp, ' ');
+			if (q != NULL)
+				*q = '\0';		/* Truncate at first space */
+
+			result = ostrdup(tmp);
+			HFREE_NULL(tmp);
+		} else {
+			result = "";		/* No change since last git tag */
+		}
+	}
+
+	return result;
+}
+
+/**
  * Are we debugging anything at a level greater than some threshold "t"?
  */
 gboolean

gtk-gnutella-0.97.tar.bz2/src/sdbm/hash.c -> gtk-gnutella-0.97.1.tar.bz2/src/sdbm/hash.c Changed

gtk-gnutella-0.97.tar.bz2/src/sdbm/sdbm.h -> gtk-gnutella-0.97.1.tar.bz2/src/sdbm/sdbm.h Changed

gtk-gnutella-0.97.tar.bz2/src/sdbm/util.c -> gtk-gnutella-0.97.1.tar.bz2/src/sdbm/util.c Changed

gtk-gnutella-0.97.tar.bz2/src/shell/cmd.h -> gtk-gnutella-0.97.1.tar.bz2/src/shell/cmd.h Changed

gtk-gnutella-0.97.tar.bz2/src/shell/download.c -> gtk-gnutella-0.97.1.tar.bz2/src/shell/download.c Changed

gtk-gnutella-0.97.tar.bz2/src/shell/downloads.c -> gtk-gnutella-0.97.1.tar.bz2/src/shell/downloads.c Changed

gtk-gnutella-0.97.tar.bz2/src/shell/echo.c -> gtk-gnutella-0.97.1.tar.bz2/src/shell/echo.c Changed

gtk-gnutella-0.97.tar.bz2/src/shell/help.c -> gtk-gnutella-0.97.1.tar.bz2/src/shell/help.c Changed

gtk-gnutella-0.97.tar.bz2/src/shell/horizon.c -> gtk-gnutella-0.97.1.tar.bz2/src/shell/horizon.c Changed

gtk-gnutella-0.97.tar.bz2/src/shell/intr.c -> gtk-gnutella-0.97.1.tar.bz2/src/shell/intr.c Changed

gtk-gnutella-0.97.tar.bz2/src/shell/log.c -> gtk-gnutella-0.97.1.tar.bz2/src/shell/log.c Changed

gtk-gnutella-0.97.tar.bz2/src/shell/memory.c -> gtk-gnutella-0.97.1.tar.bz2/src/shell/memory.c Changed

gtk-gnutella-0.97.tar.bz2/src/shell/node.c -> gtk-gnutella-0.97.1.tar.bz2/src/shell/node.c Changed

gtk-gnutella-0.97.tar.bz2/src/shell/nodes.c -> gtk-gnutella-0.97.1.tar.bz2/src/shell/nodes.c Changed

gtk-gnutella-0.97.tar.bz2/src/shell/offline.c -> gtk-gnutella-0.97.1.tar.bz2/src/shell/offline.c Changed

gtk-gnutella-0.97.tar.bz2/src/shell/online.c -> gtk-gnutella-0.97.1.tar.bz2/src/shell/online.c Changed

gtk-gnutella-0.97.tar.bz2/src/shell/print.c -> gtk-gnutella-0.97.1.tar.bz2/src/shell/print.c Changed

gtk-gnutella-0.97.tar.bz2/src/shell/props.c -> gtk-gnutella-0.97.1.tar.bz2/src/shell/props.c Changed

gtk-gnutella-0.97.tar.bz2/src/shell/quit.c -> gtk-gnutella-0.97.1.tar.bz2/src/shell/quit.c Changed

gtk-gnutella-0.97.tar.bz2/src/shell/rescan.c -> gtk-gnutella-0.97.1.tar.bz2/src/shell/rescan.c Changed

gtk-gnutella-0.97.tar.bz2/src/shell/search.c -> gtk-gnutella-0.97.1.tar.bz2/src/shell/search.c Changed

gtk-gnutella-0.97.tar.bz2/src/shell/set.c -> gtk-gnutella-0.97.1.tar.bz2/src/shell/set.c Changed

gtk-gnutella-0.97.tar.bz2/src/shell/shell.c -> gtk-gnutella-0.97.1.tar.bz2/src/shell/shell.c Changed

gtk-gnutella-0.97.tar.bz2/src/shell/shell.h -> gtk-gnutella-0.97.1.tar.bz2/src/shell/shell.h Changed

gtk-gnutella-0.97.tar.bz2/src/shell/shutdown.c -> gtk-gnutella-0.97.1.tar.bz2/src/shell/shutdown.c Changed

gtk-gnutella-0.97.tar.bz2/src/shell/stats.c -> gtk-gnutella-0.97.1.tar.bz2/src/shell/stats.c Changed

gtk-gnutella-0.97.tar.bz2/src/shell/status.c -> gtk-gnutella-0.97.1.tar.bz2/src/shell/status.c Changed

gtk-gnutella-0.97.tar.bz2/src/shell/uploads.c -> gtk-gnutella-0.97.1.tar.bz2/src/shell/uploads.c Changed

gtk-gnutella-0.97.tar.bz2/src/shell/whatis.c -> gtk-gnutella-0.97.1.tar.bz2/src/shell/whatis.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/Jmakefile -> gtk-gnutella-0.97.1.tar.bz2/src/ui/Jmakefile Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/Jmakefile -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/Jmakefile Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/bitzi.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/bitzi.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/bitzi.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/bitzi.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/clipboard.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/clipboard.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/clipboard.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/clipboard.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/columns.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/columns.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/downloads.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/downloads.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/downloads_common.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/downloads_common.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/downloads_common.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/downloads_common.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/drag.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/drag.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/drag.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/drag.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/drop.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/drop.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/drop.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/drop.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/fileinfo.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/fileinfo.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/filter.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/filter.c Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: filter.c 19142 2011-05-23 20:44:04Z rmanfredi $
- *
  * Copyright (c) 2001-2003, Raphael Manfredi, Richard Eckart
  *
  *----------------------------------------------------------------------
@@ -36,8 +34,6 @@
 
 #include "gui.h"
 
-RCSID("$Id: filter.c 19142 2011-05-23 20:44:04Z rmanfredi $")
-
 #include "gtk/misc.h"
 
 #include "filter.h"
@@ -279,7 +275,6 @@
 		{ N_("Search filters") },
 		{ N_("Free filters") },
 	};
-    GdkColor *bg_color;
     GtkTreeView *tv;
 	GtkTreeModel *model;
 	guint i;
@@ -290,8 +285,6 @@
     tv = GTK_TREE_VIEW(gui_filter_dialog_lookup("treeview_filter_filters"));
 	model = gtk_tree_view_get_model(tv);
 
-    bg_color = &(gtk_widget_get_style(GTK_WIDGET(tv))->bgGTK_STATE_ACTIVE);
-
 	for (i = 0; i < G_N_ELEMENTS(nodes); i++) {
 		GtkTreeIter iter;
 
@@ -1548,7 +1541,7 @@
 {
     GList *l_iter;
     gint count = 0;
-    GdkColor *color;
+	GdkColor *color;
     GtkCList *clist_filter_rules;
 
     if (gui_filter_dialog() == NULL)
@@ -1560,8 +1553,8 @@
     gtk_clist_freeze(clist_filter_rules);
     gtk_clist_clear(clist_filter_rules);
 
-    color = &(gtk_widget_get_style(GTK_WIDGET(clist_filter_rules))
-                ->bgGTK_STATE_INSENSITIVE);
+	color = &(gtk_widget_get_style(GTK_WIDGET(clist_filter_rules))
+				->bgGTK_STATE_INSENSITIVE);
 
     gtk_widget_set_sensitive(
         GTK_WIDGET
@@ -1633,9 +1626,12 @@
 			4, "...",
 			(-1));
 
+		/* XXX Why is this disabled? --RAM, 2011-09-11 */
 #if 0
         if (!RULE_IS_ACTIVE(r))
              gtk_clist_set_foreground(clist_filter_rules, row, color);
+#else
+		(void) color;
 #endif
     }

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/filter.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/filter.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/filter_cb.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/filter_cb.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/filter_cb.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/filter_cb.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/filter_core.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/filter_core.c Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: filter_core.c 19142 2011-05-23 20:44:04Z rmanfredi $
- *
  * Copyright (c) 2001-2003, Raphael Manfredi, Richard Eckart
  *
  *----------------------------------------------------------------------
@@ -36,8 +34,6 @@
 
 #include "gui.h"
 
-RCSID("$Id: filter_core.c 19142 2011-05-23 20:44:04Z rmanfredi $")
-
 #include "gtk/filter.h"
 #include "gtk/filter_core.h"
 #include "gtk/search.h"
@@ -2442,7 +2438,7 @@
 /**
  * Free global filters and save state.
  */
-void
+G_GNUC_COLD void
 filter_shutdown(void)
 {
     GList *f;
@@ -2490,7 +2486,7 @@
         filter_free(f->data);
 }
 
-static void
+static G_GNUC_COLD void
 filter_preset_init(const char *name, const char *regexp, filesize_t minsize)
 {
 	filter_t *filter;
@@ -2541,7 +2537,7 @@
 /**
  *  Adds simple filter rules, for use by novice users.
  */
-void
+G_GNUC_COLD void
 filter_init_presets(void)
 {
 	static const struct {
@@ -2574,7 +2570,7 @@
 	return filter;
 }
 
-static void
+static G_GNUC_COLD void
 filter_init_globals(void)
 {
 	const unsigned flags = FILTER_FLAG_GLOBAL;
@@ -2583,7 +2579,7 @@
     filter_global_post = filters_add(_("Global (post)"), flags);
 }
 
-static void
+static G_GNUC_COLD void
 filter_init_builtins(void)
 {
 	const unsigned flags = FILTER_FLAG_BUILTIN;
@@ -2598,7 +2594,7 @@
 /**
  * Initialize global filters.
  */
-void
+G_GNUC_COLD void
 filter_init(void)
 {
 	filter_init_globals();

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/filter_core.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/filter_core.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gnet_stats.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gnet_stats.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gnet_stats_common.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gnet_stats_common.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gnet_stats_common.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gnet_stats_common.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gtk-missing.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gtk-missing.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gtk-missing.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gtk-missing.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gtk-shared/callbacks.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gtk-shared/callbacks.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gtk-shared/callbacks.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gtk-shared/callbacks.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gtk1/Jmakefile -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gtk1/Jmakefile Changed

@@ -1,5 +1,5 @@
 /*
- * $Id: Jmakefile 19197 2011-05-31 20:55:41Z rmanfredi $
+ * $Id$
  *
  * Copyright (c) 2003, Raphael Manfredi
  *
@@ -25,7 +25,7 @@
  *----------------------------------------------------------------------
  */
 
-;# $Id: Jmakefile 19197 2011-05-31 20:55:41Z rmanfredi $
+;# $Id$
 
 ;# Those files lie in the ../gtk-shared directory
 REMOTE_GLADE_C = callbacks.c
@@ -117,6 +117,18 @@
 -expand
 
 /*
+ * GCC 4.6 cannot compile interface-glade.c unless -O0 is given.
+ * We rely on the fact that the C compiler will use the last -O option
+ * it sees on the command line to supersede any optimization setting
+ * specified through Configure.
+ *
+ * Also, since interface-glade.c is automatically generated code over
+ * which we have no control, suppress all warnings via -w.
+ */
+interface-glade.o: interface-glade.c
+	$(CC) -c $(JCFLAGS) -O0 -w $<
+
+/*
  * Since the copied files are compiled, they must be part of the dependency
  * for the "depend" target.  It's a multiple target, hence the "::".
  */

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gtk1/Makefile.SH -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gtk1/Makefile.SH Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gtk1/fileinfo.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gtk1/fileinfo.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gtk1/gnet_stats.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gtk1/gnet_stats.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gtk1/gtk-gnutella.glade -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gtk1/gtk-gnutella.glade Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gtk1/hcache.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gtk1/hcache.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gtk1/interface-glade.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gtk1/interface-glade.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gtk1/interface-glade.t -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gtk1/interface-glade.t Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gtk1/monitor.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gtk1/monitor.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gtk1/monitor_cb.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gtk1/monitor_cb.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gtk1/nodes.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gtk1/nodes.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gtk1/nodes_cb.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gtk1/nodes_cb.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gtk1/nodes_cb.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gtk1/nodes_cb.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gtk1/search.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gtk1/search.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gtk1/search_cb.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gtk1/search_cb.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gtk1/search_cb.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gtk1/search_cb.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gtk1/search_stats.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gtk1/search_stats.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gtk1/upload_stats.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gtk1/upload_stats.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gtk1/uploads.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gtk1/uploads.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gtk2/Jmakefile -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gtk2/Jmakefile Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gtk2/fileinfo.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gtk2/fileinfo.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gtk2/gnet_stats.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gtk2/gnet_stats.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gtk2/gtk-gnutella.glade -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gtk2/gtk-gnutella.glade Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gtk2/hcache.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gtk2/hcache.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gtk2/interface-glade.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gtk2/interface-glade.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gtk2/monitor.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gtk2/monitor.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gtk2/monitor_cb.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gtk2/monitor_cb.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gtk2/nodes.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gtk2/nodes.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gtk2/nodes_cb.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gtk2/nodes_cb.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gtk2/nodes_cb.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gtk2/nodes_cb.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gtk2/pbarcellrenderer.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gtk2/pbarcellrenderer.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gtk2/pbarcellrenderer.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gtk2/pbarcellrenderer.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gtk2/search.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gtk2/search.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gtk2/search_cb.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gtk2/search_cb.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gtk2/search_cb.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gtk2/search_cb.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gtk2/search_stats.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gtk2/search_stats.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gtk2/support-glade.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gtk2/support-glade.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gtk2/upload_stats.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gtk2/upload_stats.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gtk2/uploads.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gtk2/uploads.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gtkcolumnchooser.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gtkcolumnchooser.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gtkcolumnchooser.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gtkcolumnchooser.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/gui.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/gui.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/hcache.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/hcache.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/hcache_common.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/hcache_common.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/hcache_common.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/hcache_common.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/html_view.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/html_view.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/html_view.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/html_view.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/icon.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/icon.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/icon.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/icon.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/main.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/main.c Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: main.c 19169 2011-05-25 15:32:46Z rmanfredi $
- *
  * Copyright (c) 2001-2003, Raphael Manfredi & Richard Eckart
  *
  *----------------------------------------------------------------------
@@ -36,12 +34,15 @@
 
 #include "gui.h"
 
-RCSID("$Id: main.c 19169 2011-05-25 15:32:46Z rmanfredi $")
-
 #ifdef I_PWD
 #include <pwd.h>
 #endif /* I_PWD */
 
+#ifdef HAVE_GTKOSXAPPLICATION
+#include <igemacintegration/gtkosxapplication.h>
+#include "settings_cb.h"
+#endif
+
 #include "gtk-gnutella.h"
 
 #include "notebooks.h"
@@ -73,6 +74,8 @@
 #include "lib/halloc.h"
 #include "lib/tm.h"
 #include "lib/utf8.h"
+#include "lib/omalloc.h"
+#include "lib/path.h"
 #include "lib/override.h"			/* Must be the last header included */
 
 /***
@@ -556,6 +559,47 @@
  *** Public functions
  ***/
 
+
+#ifdef HAVE_GTKOSXAPPLICATION
+gboolean
+on_main_window_delete_event_hide(GtkWidget *unused_widget, GdkEvent *unused_event,
+							gpointer unused_udata)
+{
+	(void) unused_widget;
+	(void) unused_event;
+	(void) unused_udata;
+	
+	gtk_widget_hide(gui_main_window());
+	
+	return TRUE;
+}
+
+gboolean
+on_NSApplicationOpenFile(GtkOSXApplication *app, gchar *path, 
+						 gpointer user_data)
+{
+	(void) app;
+	(void) path;
+	(void) user_data;
+	
+	gtk_widget_show(gui_main_window());
+	
+	return TRUE;	
+}
+
+gboolean
+on_NSApplicationDidBecomeActive(GtkOSXApplication *app, gpointer user_data)
+{
+	(void) app;
+	(void) user_data;
+	
+	gtk_widget_show(gui_main_window());
+	
+	return TRUE;
+}
+
+#endif
+
 void
 main_gui_show_prefences(void)
 {
@@ -566,6 +610,220 @@
 	gdk_window_raise(gui_dlg_prefs()->window);
 }
 
+#ifdef HAVE_GTKOSXAPPLICATION
+void main_gui_init_osx()
+{
+	GError *err = NULL;
+	GtkOSXApplication *theApp = g_object_new(GTK_TYPE_OSX_APPLICATION, NULL);
+	GtkUIManager *mgr = gtk_ui_manager_new();
+	GtkOSXApplicationMenuGroup *group;
+	GtkWidget *item;
+	GtkWidget *menubar;
+	
+	g_signal_connect(theApp, "NSApplicationBlockTermination",
+					 G_CALLBACK(on_button_quit_clicked), NULL);
+	g_signal_connect(theApp, "NSApplicationDidBecomeActive",
+					 G_CALLBACK(on_NSApplicationDidBecomeActive), NULL);
+	g_signal_connect(theApp, "NSApplicationOpenFile",
+					 G_CALLBACK(on_NSApplicationOpenFile), NULL);
+	
+	gtk_ui_manager_add_ui_from_string(mgr, 
+		"<ui>"
+		"<menubar name='MenuBar'>"
+		"<menu name='File' action='FileAction'>"
+		"  <menuitem action='CloseWindow'/>"
+		"  <menuitem name='Preferences' action='PreferencesAction'/>"
+		"  <menuitem name='Quit' action='QuitAction'/>"
+		"</menu>"
+		"<menu name='View' action='ViewAction'>"
+		"  <menuitem action='menu_searchbar_visible'/>"
+		"  <menuitem action='menu_sidebar_visible'/>"
+		"  <menuitem action='menu_menubar_visible'/>"
+		"  <menuitem action='menu_statusbar_visible'/>"
+		"  <separator/>"
+		"  <menu action='connection_counters1'>"
+		"    <menuitem action='menu_downloads_visible'/>"
+		"    <menuitem action='menu_uploads_visible'/>"
+		"    <menuitem action='menu_connections_visible'/>"
+		"  </menu>"
+		
+		"  <menu action='menu_http_stats_visible'>"
+		"    <menuitem action='menu_bws_in_visible'/>"
+		"    <menuitem action='menu_bws_out_visible'/>"
+		"  </menu>"
+		
+		"  <menu action='menu_gnet_stats_visible'>"
+		"    <menuitem action='menu_bws_gin_visible'/>"
+		"    <menuitem action='menu_bws_gout_visible'/>"
+		"  </menu>"
+		
+		"  <menu action='menu_gnet_leaf_stats_visible'>"
+		"    <menuitem action='menu_autohide_bws_gleaf'/>"
+		"    <menuitem action='menu_bws_glin_visible'/>"
+		"    <menuitem action='menu_bws_glout_visible'/>"
+		"  </menu>"
+		
+		"  <menu action='menu_dht_traffic_stats_visible'>"
+		"    <menuitem action='menu_autohide_bws_dht'/>"
+		"    <menuitem action='menu_bws_dht_in_visible'/>"
+		"    <menuitem action='menu_bws_dht_out_visible'/>"
+		"  </menu>"
+		"</menu>"
+		"<menu name='Help' action='HelpAction'>"
+		"  <menuitem action='FAQAction'/>"
+		"  <menuitem name='About' action='AboutAction'/>"
+		"</menu>"
+		"</menubar>"
+		"</ui>",
+		-1, &err);
+	
+	
+	if (err != NULL) {
+		g_error("%s", err->message);
+	}
+	static GtkActionEntry entries = {
+		{ "FileAction", NULL, "_File", NULL, NULL, NULL },
+		{ "PreferencesAction", GTK_STOCK_PREFERENCES, "Preferences", 
+			NULL, "Set Viewing Preferences", 
+			G_CALLBACK(on_menu_prefs_activate) },
+		
+		{ "CloseWindow", NULL, "Close window", 
+			"<meta>W", NULL,
+			G_CALLBACK(on_main_window_delete_event_hide) },
+		
+		{ "QuitAction", GTK_STOCK_QUIT, "_Quit", 
+			"<control>q", "Quit Gtk-Gnutella", 
+			G_CALLBACK (on_button_quit_clicked) },
+		
+		{ "ViewAction", NULL, "View", NULL, NULL, NULL },		
+		
+		{ "connection_counters1", NULL,
+			"Connection counters", NULL, NULL, NULL },
+		
+		{ "menu_http_stats_visible", NULL, 
+			"_HTTP traffic stats", NULL, NULL, NULL },
+		
+		{ "menu_gnet_stats_visible", NULL, 
+			"Gnutella _traffic stats", NULL, NULL, NULL },
+		
+		{ "menu_gnet_leaf_stats_visible", NULL, 
+			"Gnutella _leaf traffic stats", NULL, NULL, NULL },
+		
+		{ "menu_dht_traffic_stats_visible", NULL, 
+			"DHT traffic stats", NULL, NULL, NULL },
+		
+		
+		{ "HelpAction", NULL, "_Help", NULL, NULL, NULL },
+		{ "FAQAction", NULL, "_FAQ",
+			NULL, "Show Frequently Asked Questions", 
+			G_CALLBACK(on_menu_faq_activate) },
+		{ "AboutAction", NULL, 
+			"_About Gtk-Gnutella", "<control>a", "About Gtk-Gnutella", 
+			G_CALLBACK(on_menu_about_activate) }
+	};
+	
+	static const GtkToggleActionEntry toggle_entries = {
+		{ "menu_searchbar_visible", NULL,

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/main.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/main.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/main_cb.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/main_cb.c Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: main_cb.c 19091 2011-05-15 09:29:32Z rmanfredi $
- *
  * Copyright (c) 2001-2003, Raphael Manfredi, Richard Eckart
  *
  *----------------------------------------------------------------------
@@ -25,8 +23,6 @@
 
 #include "gui.h"
 
-RCSID("$Id: main_cb.c 19091 2011-05-15 09:29:32Z rmanfredi $")
-
 #include "html_view.h"
 #include "main.h"
 #include "main_cb.h"
@@ -38,6 +34,8 @@
 #include "if/bridge/ui2c.h"
 
 #include "lib/file.h"
+#include "lib/halloc.h"
+#include "lib/omalloc.h"
 #include "lib/utf8.h"
 
 #include "lib/override.h"	/* Must be the last header included */
@@ -48,11 +46,11 @@
 
 static struct html_view *faq_html_view;
 
-static void
+static G_GNUC_COLD void
 load_faq(void)
 {
 	static const gchar faq_file = "FAQ";
-	static file_path_t fp4;
+	static file_path_t fp6;
 	static int initialized;
 	GtkWidget *textview;
 	const gchar *lang;
@@ -67,14 +65,31 @@
 	if (initialized != 0) {
 		i = initialized;
 	} else {
-		file_path_set(&fpi++,
-			NOT_LEAKING(make_pathname(PRIVLIB_EXP, lang)), faq_file);
+		char *tmp;
+		char *path;
+
+		tmp = get_folder_path(PRIVLIB_PATH, NULL);
+		
+		if (tmp != NULL) {
+			path = make_pathname(tmp, lang);
+			file_path_set(&fpi++, ostrdup(path), faq_file);
+			HFREE_NULL(path);
+			path = make_pathname(tmp, "en");
+			file_path_set(&fpi++, ostrdup(path), faq_file);
+			HFREE_NULL(path);
+		}
+
+		HFREE_NULL(tmp);
+
+		path = make_pathname(PRIVLIB_EXP, lang);
+		file_path_set(&fpi++, ostrdup(path), faq_file);
+		HFREE_NULL(path);
 		file_path_set(&fpi++, PRIVLIB_EXP G_DIR_SEPARATOR_S "en", faq_file);
 	
 #ifndef OFFICIAL_BUILD
-		file_path_set(&fpi++,
-			NOT_LEAKING(make_pathname(PACKAGE_EXTRA_SOURCE_DIR, lang)),
-			faq_file);
+		path = make_pathname(PACKAGE_EXTRA_SOURCE_DIR, lang);
+		file_path_set(&fpi++, ostrdup(path), faq_file);
+		HFREE_NULL(path);
 
 		file_path_set(&fpi++,
 			PACKAGE_EXTRA_SOURCE_DIR G_DIR_SEPARATOR_S "en", faq_file);

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/main_cb.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/main_cb.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/misc.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/misc.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/misc.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/misc.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/monitor.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/monitor.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/monitor_cb.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/monitor_cb.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/nodes.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/nodes.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/nodes_common.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/nodes_common.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/nodes_common.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/nodes_common.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/notebooks.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/notebooks.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/search.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/search.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/search_common.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/search_common.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/search_common.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/search_common.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/search_result.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/search_result.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/search_stats.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/search_stats.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/search_xml.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/search_xml.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/search_xml.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/search_xml.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/settings.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/settings.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/settings.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/settings.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/settings_cb.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/settings_cb.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/settings_cb.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/settings_cb.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/statusbar.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/statusbar.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/statusbar.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/statusbar.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/upload_stats.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/upload_stats.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/upload_stats.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/upload_stats.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/upload_stats_cb.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/upload_stats_cb.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/upload_stats_cb.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/upload_stats_cb.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/uploads.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/uploads.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/uploads_cb.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/uploads_cb.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/uploads_cb.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/uploads_cb.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/uploads_common.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/uploads_common.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/uploads_common.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/uploads_common.h Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/visual_progress.c -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/visual_progress.c Changed

gtk-gnutella-0.97.tar.bz2/src/ui/gtk/visual_progress.h -> gtk-gnutella-0.97.1.tar.bz2/src/ui/gtk/visual_progress.h Changed

gtk-gnutella-0.97.tar.bz2/src/upnp/control.c -> gtk-gnutella-0.97.1.tar.bz2/src/upnp/control.c Changed

gtk-gnutella-0.97.tar.bz2/src/upnp/control.h -> gtk-gnutella-0.97.1.tar.bz2/src/upnp/control.h Changed

gtk-gnutella-0.97.tar.bz2/src/upnp/discovery.c -> gtk-gnutella-0.97.1.tar.bz2/src/upnp/discovery.c Changed

gtk-gnutella-0.97.tar.bz2/src/upnp/discovery.h -> gtk-gnutella-0.97.1.tar.bz2/src/upnp/discovery.h Changed

gtk-gnutella-0.97.tar.bz2/src/upnp/error.c -> gtk-gnutella-0.97.1.tar.bz2/src/upnp/error.c Changed

gtk-gnutella-0.97.tar.bz2/src/upnp/error.h -> gtk-gnutella-0.97.1.tar.bz2/src/upnp/error.h Changed

gtk-gnutella-0.97.tar.bz2/src/upnp/natpmp.c -> gtk-gnutella-0.97.1.tar.bz2/src/upnp/natpmp.c Changed

gtk-gnutella-0.97.tar.bz2/src/upnp/natpmp.h -> gtk-gnutella-0.97.1.tar.bz2/src/upnp/natpmp.h Changed

gtk-gnutella-0.97.tar.bz2/src/upnp/service.c -> gtk-gnutella-0.97.1.tar.bz2/src/upnp/service.c Changed

gtk-gnutella-0.97.tar.bz2/src/upnp/service.h -> gtk-gnutella-0.97.1.tar.bz2/src/upnp/service.h Changed

gtk-gnutella-0.97.tar.bz2/src/upnp/upnp.c -> gtk-gnutella-0.97.1.tar.bz2/src/upnp/upnp.c Changed

gtk-gnutella-0.97.tar.bz2/src/upnp/upnp.h -> gtk-gnutella-0.97.1.tar.bz2/src/upnp/upnp.h Changed

gtk-gnutella-0.97.tar.bz2/src/xml/vxml.c -> gtk-gnutella-0.97.1.tar.bz2/src/xml/vxml.c Changed

@@ -1,6 +1,4 @@
 /*
- * $Id: vxml.c 19224 2011-06-02 21:54:08Z rmanfredi $
- *
  * Copyright (c) 2010, 2011, Raphael Manfredi
  *
  *----------------------------------------------------------------------
@@ -35,8 +33,6 @@
 
 #include "common.h"
 
-RCSID("$Id: vxml.c 19224 2011-06-02 21:54:08Z rmanfredi $")
-
 #include "vxml.h"
 #include "xattr.h"
 #include "xfmt.h"
@@ -1377,7 +1373,7 @@
 /**
  * Translates errors into English.
  */
-const char *
+G_GNUC_COLD const char *
 vxml_strerror(vxml_error_t error)
 {
 	switch (error) {
@@ -1468,7 +1464,7 @@
  * Formats document parsing name and parsing position into a static buffer
  * for error logging.
  */
-static const char *
+static G_GNUC_COLD const char *
 vxml_document_where(vxml_parser_t *vp)
 {
 	static char buf1024;
@@ -2276,7 +2272,7 @@
 /**
  * Is Unicode character a valid character for a name start.
  */
-static gboolean
+static G_GNUC_CONST gboolean
 vxml_is_valid_name_start_char(guint32 uc)
 {
 	/*
@@ -2324,7 +2320,7 @@
 /*
  * Is Unicode character a valid character within a name.
  */
-static gboolean
+static G_GNUC_CONST gboolean
 vxml_is_valid_name_char(guint32 uc)
 {
 	/*
@@ -2351,7 +2347,7 @@
 /**
  * Is Unicode character a white space?
  */
-static gboolean
+static G_GNUC_CONST gboolean
 vxml_is_white_space_char(guint32 uc)
 {
 	/*
@@ -2364,7 +2360,7 @@
 /*
  * Is Unicode character in the upper-ASCII letter range?
  */
-static gboolean
+static G_GNUC_CONST gboolean
 vxml_is_ascii_upper_letter_char(guint32 uc)
 {
 	return uc >= 0x41U && uc <= 0x5AU;		/* A-Z */
@@ -6392,7 +6388,7 @@
 
 const char faulty = "<a>text<b>other text<c>x</c><d><e>text</a>";
 
-static void
+static G_GNUC_COLD void
 vxml_run_simple_test(int num, const char *name,
 	const char *data, size_t len, guint32 flags, vxml_error_t error)
 {
@@ -6416,7 +6412,7 @@
 	vxml_parser_free(vp);
 }
 
-static void
+static G_GNUC_COLD void
 vxml_run_ns_simple_test(int num, const char *name,
 	const char *data, size_t len, guint32 flags,
 	vxml_error_t error_no_ns, vxml_error_t error_with_ns)
@@ -6440,7 +6436,7 @@
 	void *data;
 };
 
-static void
+static G_GNUC_COLD void
 vxml_run_callback_test(int num, const char *name,
 	const char *data, size_t len, guint32 flags,
 	const struct vxml_ops *ops, struct vxml_token *tvec, size_t tlen,
@@ -6496,7 +6492,7 @@
 	ostream_close(os);
 }
 
-static xnode_t *
+static G_GNUC_COLD xnode_t *
 vxml_run_tree_test(int num, const char *name,
 	const char *data, size_t len, guint32 flags, vxml_error_t error)
 {
@@ -6528,7 +6524,7 @@
 	return VXML_E_OK == e ? root : NULL;
 }
 
-static void
+static G_GNUC_COLD void
 tricky_text(vxml_parser_t *vp,
 	const char *name, const char *text, size_t len, void *data)
 {
@@ -6555,7 +6551,7 @@
 #define T_C		3
 #define T_D		4
 
-static void
+static G_GNUC_COLD void
 evaluation_text(vxml_parser_t *vp,
 	unsigned id, const char *text, size_t len, void *data)
 {
@@ -6578,7 +6574,7 @@
 	g_assert(0 == strcmp(text, expected));
 }
 
-static void
+static G_GNUC_COLD void
 blank_text(vxml_parser_t *vp,
 	unsigned id, const char *text, size_t len, void *data)
 {
@@ -6693,7 +6689,7 @@
 	}
 }
 
-static void
+static G_GNUC_COLD void
 subparse_start(vxml_parser_t *vp,
 	const char *name, const xattr_table_t *attrs, void *data)
 {
@@ -6741,7 +6737,7 @@
 	return xnode_is_element(xn) && 0 == strcmp(name, xnode_element_name(xn));
 }
 
-void
+G_GNUC_COLD void
 vxml_test(void)
 {
 	struct vxml_ops ops;

gtk-gnutella-0.97.tar.bz2/src/xml/vxml.h -> gtk-gnutella-0.97.1.tar.bz2/src/xml/vxml.h Changed

gtk-gnutella-0.97.tar.bz2/src/xml/xattr.c -> gtk-gnutella-0.97.1.tar.bz2/src/xml/xattr.c Changed

gtk-gnutella-0.97.tar.bz2/src/xml/xattr.h -> gtk-gnutella-0.97.1.tar.bz2/src/xml/xattr.h Changed

gtk-gnutella-0.97.tar.bz2/src/xml/xfmt.c -> gtk-gnutella-0.97.1.tar.bz2/src/xml/xfmt.c Changed

gtk-gnutella-0.97.tar.bz2/src/xml/xfmt.h -> gtk-gnutella-0.97.1.tar.bz2/src/xml/xfmt.h Changed

gtk-gnutella-0.97.tar.bz2/src/xml/xnode.c -> gtk-gnutella-0.97.1.tar.bz2/src/xml/xnode.c Changed

gtk-gnutella-0.97.tar.bz2/src/xml/xnode.h -> gtk-gnutella-0.97.1.tar.bz2/src/xml/xnode.h Changed

gtk-gnutella-0.97.tar.bz2/src/revision.h Deleted

gtk-gnutella-0.97.tar.bz2/src/revision_h.SH Deleted

Changes of Revision 2