[tor-bugs] #4366 [Tor Client]: duplicate includes

Tor Bug Tracker & Wiki torproject-admin at torproject.org
Tue Nov 1 03:22:56 UTC 2011


#4366: duplicate includes
------------------------+---------------------------------------------------
 Reporter:  arma        |          Owner:                    
     Type:  defect      |         Status:  new               
 Priority:  normal      |      Milestone:  Tor: 0.2.3.x-final
Component:  Tor Client  |        Version:                    
 Keywords:              |         Parent:                    
   Points:              |   Actualpoints:                    
------------------------+---------------------------------------------------
 I got a nice mail from somebody named Andrea Gelmini with a patch to
 remove some duplicate include lines. Here is the patch:
 {{{
 Signed-off-by: Andrea Gelmini <andrea.gelmini at gelma.net>
 ---
  src/common/compat.h  |    3 ---
  src/common/crypto.c  |    2 --
  src/common/mempool.c |    4 ----
  src/or/eventdns.c    |    1 -
  4 files changed, 0 insertions(+), 10 deletions(-)

 diff --git a/src/common/compat.h b/src/common/compat.h
 index 8e271ba..045f414 100644
 --- a/src/common/compat.h
 +++ b/src/common/compat.h
 @@ -45,9 +45,6 @@
  #ifdef HAVE_SYS_SOCKET_H
  #include <sys/socket.h>
  #endif
 -#ifdef HAVE_SYS_TYPES_H
 -#include <sys/types.h>
 -#endif
  #ifdef HAVE_NETINET_IN_H
  #include <netinet/in.h>
  #endif
 diff --git a/src/common/crypto.c b/src/common/crypto.c
 index 0763a2c..f2ef833 100644
 --- a/src/common/crypto.c
 +++ b/src/common/crypto.c
 @@ -64,8 +64,6 @@
  #error "We require OpenSSL >= 0.9.7"
  #endif

 -#include <openssl/engine.h>
 -
  #ifdef ANDROID
  /* Android's OpenSSL seems to have removed all of its Engine support. */
  #define DISABLE_ENGINES
 diff --git a/src/common/mempool.c b/src/common/mempool.c
 index 30d7788..c753052 100644
 --- a/src/common/mempool.c
 +++ b/src/common/mempool.c
 @@ -1,9 +1,5 @@
  /* Copyright (c) 2007-2011, The Tor Project, Inc. */
  /* See LICENSE for licensing information */
 -#if 1
 -/* Tor dependencies */
 -#include "orconfig.h"
 -#endif

  #include <stdlib.h>
  #include <string.h>
 diff --git a/src/or/eventdns.c b/src/or/eventdns.c
 index 7fe376b..aa12324 100644
 --- a/src/or/eventdns.c
 +++ b/src/or/eventdns.c
 @@ -64,7 +64,6 @@
  #include <openssl/rand.h>
  #endif

 -#include <string.h>
  #ifdef HAVE_FCNTL_H
  #include <fcntl.h>
  #endif
 --
 1.7.8.rc0.156.gdf33

-- 
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/4366>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online


More information about the tor-bugs mailing list