[xar] r228 committed - * lib/signature.c: fix a warning with a printf formatting string...

[codesite...@google.com]

Revision: 228
Author: bbraun
Date: Tue Nov 24 17:25:24 2009
Log: * lib/signature.c: fix a warning with a printf formatting string
* lib/util.c lib/util.h lib/appledouble.h include/xar.h.in: adjust the
inclusion of stdint.h to hopefully avoid problems on proto-c99 systems that
have inttypes.h but not stdint.h. Issue #68

http://code.google.com/p/xar/source/detail?r=228

Modified:
/trunk/xar/ChangeLog
/trunk/xar/include/xar.h.in
/trunk/xar/lib/appledouble.h
/trunk/xar/lib/signature.c
/trunk/xar/lib/util.c
/trunk/xar/lib/util.h

=======================================
--- /trunk/xar/ChangeLog Tue Nov 24 17:11:05 2009
+++ /trunk/xar/ChangeLog Tue Nov 24 17:25:24 2009
@@ -1,5 +1,7 @@
devel
2009-11-24 Rob Braun bbr...@synack.net
+ * lib/signature.c: fix a warning with a printf formatting string
+ * lib/util.c lib/util.h lib/appledouble.h include/xar.h.in: adjust the
inclusion of stdint.h to hopefully avoid problems on proto-c99 systems that
have inttypes.h but not stdint.h. Issue #68
* src/xar.c: If a compression type is specified that we don't
support/haven't been compiled with, spit out an error.
* configure.ac: Allow explicit disabling of bzip2 support.
2009-07-08 Rob Braun bbr...@synack.net
=======================================
--- /trunk/xar/include/xar.h.in Fri Dec 19 08:34:32 2008
+++ /trunk/xar/include/xar.h.in Tue Nov 24 17:25:24 2009
@@ -41,7 +41,11 @@
#define XAR_VERSION "@XAR_VERSION@"

#include <sys/types.h>
+#if __STDC_VERSION__ >= 199901
#include <stdint.h>
+#else
+#include <inttypes.h>
+#endif
#include <sys/stat.h>

#pragma pack(4)
=======================================
--- /trunk/xar/lib/appledouble.h Wed Aug 16 17:40:10 2006
+++ /trunk/xar/lib/appledouble.h Tue Nov 24 17:25:24 2009
@@ -8,7 +8,11 @@
#define __APPLEDOUBLE__

#include <sys/types.h>
+#if __STDC_VERSION__ >= 199901
#include <stdint.h>
+#else
+#include <inttypes.h>
+#endif

/* Structure of an AppleSingle file:
* ----------------------
=======================================
--- /trunk/xar/lib/signature.c Fri Feb 2 12:50:35 2007
+++ /trunk/xar/lib/signature.c Tue Nov 24 17:25:24 2009
@@ -381,7 +381,7 @@

/* <size> */
xmlTextWriterStartElementNS( writer, NULL, BAD_CAST("size"), NULL);
- xmlTextWriterWriteFormatString(writer, "%ld", (XAR_SIGNATURE(sig)->len));
+ xmlTextWriterWriteFormatString(writer, "%" PRId32,
(XAR_SIGNATURE(sig)->len));
xmlTextWriterEndElement(writer);

/* <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"> */
=======================================
--- /trunk/xar/lib/util.c Wed Sep 19 15:27:10 2007
+++ /trunk/xar/lib/util.c Tue Nov 24 17:25:24 2009
@@ -36,7 +36,6 @@
*/

#include <stdio.h>
-#include <stdint.h>
#include <sys/types.h>
#include <arpa/inet.h>
#include <string.h>
=======================================
--- /trunk/xar/lib/util.h Tue Sep 18 12:06:34 2007
+++ /trunk/xar/lib/util.h Tue Nov 24 17:25:24 2009
@@ -38,7 +38,6 @@
#ifndef _XAR_UTIL_H_
#define _XAR_UTIL_H_

-#include <stdint.h>
#include "xar.h"