libelwix/src/pack.c - diff

Return to pack.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / libelwix / src

Diff for /libelwix/src/pack.c between versions 1.5 and 1.6

-version 1.5, 2014/02/11 00:43:41
+version 1.6, 2014/02/11 01:06:21
  Line 295  rpack_data(rpack_t * __restrict rp, void * __restrict
  }
  /*
- * rpack_raw() - Pack/Unpack raw data
+ * rpack_rdata() - Pack/Unpack raw data
   *
   * @rp = raw buffer
   * @dat = data
  Line 303  rpack_data(rpack_t * __restrict rp, void * __restrict
   * return: NULL error or != NULL get data, must be e_free() after use!
   */
  void *
-rpack_raw(rpack_t * __restrict rp, void * __restrict dat, size_t datlen)
+rpack_rdata(rpack_t * __restrict rp, void * __restrict dat, size_t datlen)
  {
          void *buf = NULL;
  Line 324  rpack_raw(rpack_t * __restrict rp, void * __restrict d
          rp->r_next += datlen;
          return buf;
+ }
+ /*
+  * rpack_ruint16() - Pack/Unpack raw 16bit value
+  *
+  * @rp = raw buffer
+  * @n = set value if !=NULL
+  * @be = extract in big-endian
+  * return: -1 error or get value
+  */
+ uint16_t
+ rpack_ruint16(rpack_t * __restrict rp, uint16_t * __restrict n, int be)
+ {
+         uint16_t u;
+         if (!RPACK_SANITY(rp))
+                 return (uint16_t) -1;
+         /* No space left */
+         if (sizeof(uint16_t) + rp->r_next - rp->r_buf > rp->r_len)
+                 return (uint16_t) -1;
+         u = be ? EXTRACT_BE_16(rp->r_next) : EXTRACT_LE_16(rp->r_next);
+         if (n)
+                 RPACK_SET_16(rp->r_next, n);
+         rp->r_next += sizeof(uint16_t);
+         return u;
+ }
+ /*
+  * rpack_ruint24() - Pack/Unpack raw 24bit value
+  *
+  * @rp = raw buffer
+  * @n = set value if !=NULL
+  * @be = extract in big-endian
+  * return: -1 error or get value
+  */
+ uint32_t
+ rpack_ruint24(rpack_t * __restrict rp, uint32_t * __restrict n, int be)
+ {
+         uint32_t u;
+         if (!RPACK_SANITY(rp))
+                 return (uint32_t) -1;
+         /* No space left */
+         if (sizeof(uint32_t) + rp->r_next - rp->r_buf > rp->r_len)
+                 return (uint32_t) -1;
+         u = be ? EXTRACT_BE_24(rp->r_next) : EXTRACT_LE_24(rp->r_next);
+         if (n)
+                 RPACK_SET_24(rp->r_next, n);
+         rp->r_next += sizeof(uint32_t);
+         return u;
+ }
+ /*
+  * rpack_ruint32() - Pack/Unpack raw 32bit value
+  *
+  * @rp = raw buffer
+  * @n = set value if !=NULL
+  * @be = extract in big-endian
+  * return: -1 error or get value
+  */
+ uint32_t
+ rpack_ruint32(rpack_t * __restrict rp, uint32_t * __restrict n, int be)
+ {
+         uint32_t u;
+         if (!RPACK_SANITY(rp))
+                 return (uint32_t) -1;
+         /* No space left */
+         if (sizeof(uint32_t) + rp->r_next - rp->r_buf > rp->r_len)
+                 return (uint32_t) -1;
+         u = be ? EXTRACT_BE_32(rp->r_next) : EXTRACT_LE_32(rp->r_next);
+         if (n)
+                 RPACK_SET_32(rp->r_next, n);
+         rp->r_next += sizeof(uint32_t);
+         return u;
+ }
+ /*
+  * rpack_ruint64() - Pack/Unpack raw 64bit value
+  *
+  * @rp = raw buffer
+  * @n = set value if !=NULL
+  * @be = extract in big-endian
+  * return: -1 error or get value
+  */
+ uint64_t
+ rpack_ruint64(rpack_t * __restrict rp, uint64_t * __restrict n, int be)
+ {
+         uint64_t u;
+         if (!RPACK_SANITY(rp))
+                 return (uint64_t) -1;
+         /* No space left */
+         if (sizeof(uint64_t) + rp->r_next - rp->r_buf > rp->r_len)
+                 return (uint64_t) -1;
+         u = be ? EXTRACT_BE_64(rp->r_next) : EXTRACT_LE_64(rp->r_next);
+         if (n)
+                 RPACK_SET_64(rp->r_next, n);
+         rp->r_next += sizeof(uint64_t);
+         return u;
  }

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.5
changed lines
	Added in v.1.6