Commit 60f01da7 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Use smaller CPP error messages 

Clang-format wants to split these messages across multiple lines,
which confuses the heck out of coccinelle.
parent e9b663be

src/feature/dirclient/dirclient.c

+2 −3
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
#include "feature/rend/rendservice.h"

#include "feature/stats/predict_ports.h"



#include "lib/cc/ctassert.h"

#include "lib/compress/compress.h"

#include "lib/crypt_ops/crypto_format.h"

#include "lib/crypt_ops/crypto_util.h"
@@ -1443,9 +1444,7 @@ compare_strs_(const void **a, const void **b) 
}



#define CONDITIONAL_CONSENSUS_FPR_LEN 3

#if (CONDITIONAL_CONSENSUS_FPR_LEN > DIGEST_LEN)

#error "conditional consensus fingerprint length is larger than digest length"

#endif

CTASSERT(CONDITIONAL_CONSENSUS_FPR_LEN <= DIGEST_LEN);



/** Return the URL we should use for a consensus download.

 *

src/lib/cc/compat_compiler.h

+2 −2
Original line number Diff line number Diff line
@@ -25,11 +25,11 @@ 
#endif /* defined(__has_feature) */



#ifndef NULL_REP_IS_ZERO_BYTES

#error "It seems your platform does not represent NULL as zero. We can't cope."

#error "Your platform does not represent NULL as zero. We can't cope."

#endif



#ifndef DOUBLE_0_REP_IS_ZERO_BYTES

#error "It seems your platform does not represent 0.0 as zeros. We can't cope."

#error "Your platform does not represent 0.0 as zeros. We can't cope."

#endif



#if 'a'!=97 || 'z'!=122 || 'A'!=65 || ' '!=32

src/lib/cc/torint.h

+3 −4
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ typedef int32_t ssize_t; 
 * aren't 2's complement, and you don't define LONG_MAX, then you're so

 * bizarre that I want nothing to do with you. */

#ifndef USING_TWOS_COMPLEMENT

#error "Seems that your platform doesn't use 2's complement arithmetic. Argh."

#error "Your platform doesn't use 2's complement arithmetic."

#endif



#ifndef TIME_MAX
@@ -126,12 +126,11 @@ typedef int32_t ssize_t; 
#define SIZE_T_CEILING  ((size_t)(SSIZE_MAX-16))



#if SIZEOF_INT > SIZEOF_VOID_P

#error "sizeof(int) > sizeof(void *) - Tor cannot be built on this platform!"

#error "sizeof(int) > sizeof(void *) - Can't build Tor here."

#endif



#if SIZEOF_UNSIGNED_INT > SIZEOF_VOID_P

#error "sizeof(unsigned int) > sizeof(void *) - Tor cannot be built on this \

platform!"

#error "sizeof(unsigned int) > sizeof(void *) - Can't build Tor here."

#endif



#endif /* !defined(TOR_TORINT_H) */

src/lib/ctime/di_ops.c

+2 −2
Original line number Diff line number Diff line
@@ -72,10 +72,10 @@ tor_memcmp(const void *a, const void *b, size_t len) 
     * actually implementation-defined in standard C.  So how do we

     * get away with assuming it?  Easy.  We check.) */

#if ((-60 >> 8) != -1)

#error "According to cpp, right-shift doesn't perform sign-extension."

#error "cpp says right-shift doesn't perform sign-extension."

#endif

#ifndef RSHIFT_DOES_SIGN_EXTEND

#error "According to configure, right-shift doesn't perform sign-extension."

#error "configure says right-shift doesn't perform sign-extension."

#endif



    /* If v1 == v2, equal_p is ~0, so this will leave retval

src/lib/memarea/memarea.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#elif MEMAREA_ALIGN == 8

#define MEMAREA_ALIGN_MASK ((uintptr_t)7)

#else

#error "void* is neither 4 nor 8 bytes long. I don't know how to align stuff."

#error "void* is neither 4 nor 8 bytes long."

#endif /* MEMAREA_ALIGN == 4 || ... */



#if defined(__GNUC__) && defined(FLEXIBLE_ARRAY_MEMBER)