X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=portable_io.h;h=fdd4165d70e5acda33fe2b97f1b3141730ce0c08;hp=c72d6d4951bb784816502a982185647ef9bcfe63;hb=ba83a291cd486e8ab53ac64d81b17d8f5705d715;hpb=3879481ddabc38236b9eee979a090c2a9bfa74d3

diff --git a/portable_io.h b/portable_io.h
index c72d6d49..fdd4165d 100644
--- a/portable_io.h
+++ b/portable_io.h
@@ -1,70 +1,121 @@
-/*
- * Copyright (C) 2007-2013 Andre Noll <maan@systemlinux.org>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2007 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
-/** \file portable_io.h Inline functions for endian-independent binary IO. */
+/** \file portable_io.h Inline functions for binary IO. */
 
-static inline uint64_t read_portable(unsigned bits, const char *buf)
+static inline uint64_t read_portable(unsigned bits, const void *buf)
 {
 	uint64_t ret = 0;
 	int i, num_bytes = bits / 8;
+	const uint8_t *p = (typeof(p))buf;
 
 	for (i = 0; i < num_bytes; i++) {
-		unsigned char c = buf[i];
+		unsigned char c = p[i];
 		ret += ((uint64_t)c << (8 * i));
 	}
 	return ret;
 }
 
-static inline uint64_t read_u64(const char *buf)
+static inline uint64_t read_portable_be(unsigned bits, const void *buf)
+{
+	uint64_t ret = 0;
+	int i, num_bytes = bits / 8;
+	const uint8_t *p = (typeof(p))buf;
+
+	for (i = 0; i < num_bytes; i++) {
+		unsigned char c = p[i];
+		ret += ((uint64_t)c << (8 * (num_bytes - i - 1)));
+	}
+	return ret;
+}
+
+static inline uint64_t read_u64(const void *buf)
 {
 	return read_portable(64, buf);
 }
 
-static inline uint32_t read_u32(const char *buf)
+static inline uint32_t read_u32(const void *buf)
 {
 	return read_portable(32, buf);
 }
 
-static inline uint16_t read_u16(const char *buf)
+static inline uint16_t read_u16(const void *buf)
 {
 	return read_portable(16, buf);
 }
 
-static inline uint8_t read_u8(const char *buf)
+static inline uint8_t read_u8(const void *buf)
 {
 	return read_portable(8, buf);
 }
 
+static inline uint64_t read_u64_be(const void *buf)
+{
+	return read_portable_be(64, buf);
+}
+
+static inline uint32_t read_u32_be(const void *buf)
+{
+	return read_portable_be(32, buf);
+}
+
+static inline uint16_t read_u16_be(const void *buf)
+{
+	return read_portable_be(16, buf);
+}
+
 static inline void write_portable(unsigned bits, char *buf, uint64_t val)
 {
 	int i, num_bytes = bits / 8;
-//	fprintf(stderr, "val: %lu\n", val);
+	uint8_t *p = (typeof(p))buf;
+
+	for (i = 0; i < num_bytes; i++) {
+		p[i] = val & 0xff;
+		val = val >> 8;
+	}
+}
+
+static inline void write_portable_be(unsigned bits, char *buf, uint64_t val)
+{
+	int i, num_bytes = bits / 8;
+	uint8_t *p = (typeof(p))buf;
+
 	for (i = 0; i < num_bytes; i++) {
-		buf[i] = val & 0xff;
-//		fprintf(stderr, "buf[%d]=%x\n", i, buf[i]);
+		p[num_bytes - i - 1] = val & 0xff;
 		val = val >> 8;
 	}
 }
 
-static inline void write_u64(char *buf, uint64_t val)
+static inline void write_u64(void *buf, uint64_t val)
 {
 	write_portable(64, buf, val);
 }
 
-static inline void write_u32(char *buf, uint32_t val)
+static inline void write_u32(void *buf, uint32_t val)
 {
 	write_portable(32, buf, (uint64_t) val);
 }
 
-static inline void write_u16(char *buf, uint16_t val)
+static inline void write_u16(void *buf, uint16_t val)
 {
 	write_portable(16, buf, (uint64_t) val);
 }
 
-static inline void write_u8(char *buf, uint8_t val)
+static inline void write_u8(void *buf, uint8_t val)
 {
 	write_portable(8, buf, (uint64_t) val);
 }
+
+static inline void write_u64_be(void *buf, uint64_t val)
+{
+	write_portable_be(64, buf, val);
+}
+
+static inline void write_u32_be(void *buf, uint32_t val)
+{
+	write_portable_be(32, buf, (uint64_t) val);
+}
+
+static inline void write_u16_be(void *buf, uint16_t val)
+{
+	write_portable_be(16, buf, (uint64_t) val);
+}