diff options
author | Jörg Frings-Fürst <debian@jff.email> | 2018-06-29 07:20:34 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff.email> | 2018-06-29 07:20:34 +0200 |
commit | 282d6786eb654c10b18b938b047699b684e19b32 (patch) | |
tree | 96816c7c897ee2f4db7c889f55bd905b69a01076 | |
parent | 380a9a3ff3a376cfe768033375663e934516e4a6 (diff) | |
parent | 7eb875f3a36b77bcb3b066bd7b8de66e223f807d (diff) |
Merge branch 'feature/upstream' into develop
-rw-r--r-- | changelog | 4 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | debian/changelog | 6 | ||||
-rw-r--r-- | lib/psocksxx/sockstreambuf.cpp | 14 |
4 files changed, 19 insertions, 9 deletions
@@ -1,3 +1,7 @@ +1.1.1 - 14th June 2018 + * Drop ordered comparisons between pointers and zero + * Use NULL instead of 0 for pointers + 1.1.0 - 29th November 2015 * Add examples * Enforce Automake version check in configure.ac diff --git a/configure.ac b/configure.ac index 1a27829..e905f57 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.68]) -AC_INIT([psocksxx], [1.1.0], [https://github.com/nukedzn/psocksxx/issues]) +AC_INIT([psocksxx], [1.1.1], [https://github.com/nukedzn/psocksxx/issues]) AC_CONFIG_AUX_DIR([aux-build]) AC_CONFIG_MACRO_DIR([aux-build/m4]) AC_CONFIG_HEADERS([include/config.h]) @@ -33,7 +33,7 @@ AC_CONFIG_HEADERS([include/config.h]) # CURRENT : REVISION : AGE # lib versions -LIBPSOCKSXX_LT_VERSION=1:3:1 +LIBPSOCKSXX_LT_VERSION=1:4:1 AC_SUBST(LIBPSOCKSXX_LT_VERSION) # init diff --git a/debian/changelog b/debian/changelog index eb664fc..c41136c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +psocksxx (1.1.1-1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Jörg Frings-Fürst <debian@jff.email> Thu, 28 Jun 2018 06:55:17 +0200 + psocksxx (1.1.0-2) unstable; urgency=medium * debian/control: diff --git a/lib/psocksxx/sockstreambuf.cpp b/lib/psocksxx/sockstreambuf.cpp index c0a0c81..af3f308 100644 --- a/lib/psocksxx/sockstreambuf.cpp +++ b/lib/psocksxx/sockstreambuf.cpp @@ -68,7 +68,7 @@ namespace psocksxx { cleanup_buffers(); // cleanup timeout - if ( _timeout != 0 ) { + if ( _timeout ) { delete _timeout; } @@ -78,7 +78,7 @@ namespace psocksxx { void sockstreambuf::init_defaults() throw() { // timeout structure reference - _timeout = 0; + _timeout = NULL; // timed-out status _timed_out = false; @@ -165,7 +165,7 @@ namespace psocksxx { } // setup timeout if needed - if ( timeout > 0 ) { + if ( timeout ) { // make the socket non-blocking if ( fcntl( _socket, F_SETFL, ( s_flags | O_NONBLOCK ) ) == -1 ) { @@ -180,7 +180,7 @@ namespace psocksxx { } // check for timeout if set - if ( timeout > 0 ) { + if ( timeout ) { if (! ready( timeout ) ) { @@ -264,13 +264,13 @@ namespace psocksxx { void * sockstreambuf::clear_timeout() throw() { // sanity check - if ( _timeout != 0 ) { + if ( _timeout ) { // delete structure delete _timeout; // set a null pointer - _timeout = 0; + _timeout = NULL; } @@ -481,7 +481,7 @@ namespace psocksxx { _timed_out = false; // create timespec structure from timeval structure - if ( timeout != 0 ) { + if ( timeout ) { t_spec = new timespec; t_spec->tv_sec = timeout->tv_sec; t_spec->tv_nsec = ( timeout->tv_usec * 1000 ); |