Dan McGee <dpmcgee@gmail.com>

* Removed some unnecessary headers and library links
* Made things static if possible
* Cleaned up makefiles a bit
* Fixed some old comments in the code
* Fixed some errors the static code checker splint pointed out
* Backwards arguments in a memset call in _alpm_db_read (could have been worse)
* Other various small fixes

Other:
* Default to 80 columns when getcols cannot determine display width
* Removal of ._install as a valid install file in packages

1 files changed, 9 insertions, 3 deletions

diff --git a/lib/libalpm/sha1.h b/lib/libalpm/sha1.h
index f00b4122..db16d536 100644
--- a/lib/libalpm/sha1.h
+++ b/lib/libalpm/sha1.h
@@ -20,9 +20,14 @@
 #include <limits.h>
 
 #define rol(x,n) ( ((x) << (n)) | ((x) >> (32 -(n))) )
+/* TODO check this comment */
 /* The code below is from md5.h (from coreutils), little modifications */
 #define UINT_MAX_32_BITS 4294967295U
 
+/* This new ifdef allows splint to not fail on its static code check */
+#ifdef S_SPLINT_S
+		typedef unsigned int sha_uint32;
+#else
 #if UINT_MAX == UINT_MAX_32_BITS
     typedef unsigned int sha_uint32;
 #else
@@ -34,9 +39,10 @@
 #else
     /* The following line is intended to evoke an error. Using #error is not portable enough.  */
 #error "Cannot determine unsigned 32-bit data type"
-#endif
-#endif
-#endif
+#endif /* ULONG_MAX */
+#endif /* USHRT_MAX */
+#endif /* UINT_MAX */
+#endif /* S_SPLINT_S */
 /* We have to make a guess about the integer type equivalent in size
    to pointers which should always be correct.  */
 typedef unsigned long int sha_uintptr;