X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=portable_io.h;h=4e10c2e3386d1511ac6f71bbfc47210d02852e3a;hp=f1a38929043ec3b1ed3993f05ca49d7eb1b52574;hb=a85b3b947174c64ce06b4d6e438677055bf3f1ae;hpb=ca006af72cef95b0aba3cad799badde47010a621

diff --git a/portable_io.h b/portable_io.h
index f1a38929..4e10c2e3 100644
--- a/portable_io.h
+++ b/portable_io.h
@@ -4,7 +4,7 @@
  * Licensed under the GPL v2. For licencing details see 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)
 {
@@ -18,6 +18,18 @@ static inline uint64_t read_portable(unsigned bits, const char *buf)
 	return ret;
 }
 
+static inline uint64_t read_portable_be(unsigned bits, const char *buf)
+{
+	uint64_t ret = 0;
+	int i, num_bytes = bits / 8;
+
+	for (i = 0; i < num_bytes; i++) {
+		unsigned char c = buf[i];
+		ret += ((uint64_t)c << (8 * (num_bytes - i - 1)));
+	}
+	return ret;
+}
+
 static inline uint64_t read_u64(const char *buf)
 {
 	return read_portable(64, buf);
@@ -38,13 +50,35 @@ static inline uint8_t read_u8(const char *buf)
 	return read_portable(8, buf);
 }
 
+static inline uint64_t read_u64_be(const char *buf)
+{
+	return read_portable_be(64, buf);
+}
+
+static inline uint32_t read_u32_be(const char *buf)
+{
+	return read_portable_be(32, buf);
+}
+
+static inline uint16_t read_u16_be(const char *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);
 	for (i = 0; i < num_bytes; i++) {
 		buf[i] = val & 0xff;
-//		fprintf(stderr, "buf[%d]=%x\n", i, buf[i]);
+		val = val >> 8;
+	}
+}
+
+static inline void write_portable_be(unsigned bits, char *buf, uint64_t val)
+{
+	int i, num_bytes = bits / 8;
+	for (i = 0; i < num_bytes; i++) {
+		buf[num_bytes - i - 1] = val & 0xff;
 		val = val >> 8;
 	}
 }
@@ -68,3 +102,18 @@ static inline void write_u8(char *buf, uint8_t val)
 {
 	write_portable(8, buf, (uint64_t) val);
 }
+
+static inline void write_u64_be(char *buf, uint64_t val)
+{
+	write_portable_be(64, buf, val);
+}
+
+static inline void write_u32_be(char *buf, uint32_t val)
+{
+	write_portable_be(32, buf, (uint64_t) val);
+}
+
+static inline void write_u16_be(char *buf, uint16_t val)
+{
+	write_portable_be(16, buf, (uint64_t) val);
+}