Diff for /libelwix/inc/elwix/apack.h between versions 1.8.2.2 and 1.9

version 1.8.2.2, 2014/02/12 09:20:43 version 1.9, 2014/02/21 13:30:19
Line 62  typedef struct tagRawPacket { Line 62  typedef struct tagRawPacket {
                                 } while (0)                                  } while (0)
 #define RPACK_SANITY(x)         ((x) && (x)->r_buf && (x)->r_next && (x)->r_next >= (x)->r_buf)  #define RPACK_SANITY(x)         ((x) && (x)->r_buf && (x)->r_next && (x)->r_next >= (x)->r_buf)
 #define RPACK_BUF(x)            (assert((x)), (x)->r_buf)  #define RPACK_BUF(x)            (assert((x)), (x)->r_buf)
   #define RPACK_NEXT(x)           (assert((x)), (x)->r_next)
 #define RPACK_LEN(x)            (assert((x)), (x)->r_len)  #define RPACK_LEN(x)            (assert((x)), (x)->r_len)
 #define RPACK_REWIND(x)         (assert((x)), (x)->r_next = (x)->r_buf)  #define RPACK_REWIND(x)         (assert((x)), (x)->r_next = (x)->r_buf)
   #define RPACK_OFF(x)            (assert((x)), (x)->r_next - (x)->r_buf)
   #define RPACK_REMAIN(x)         (assert((x)), (x)->r_len - ((x)->r_next - (x)->r_buf))
   #define RPACK_ISEND(x)          (assert((x)), (size_t) ((x)->r_next - (x)->r_buf) >= (x)->r_len)
   
 #define RPACK_SET_16(x, n)      do { assert((x)); \  #define RPACK_SET_16(x, n)      do { assert((x)); \
                                         *((uint8_t *) (x) + 1) = *((const uint8_t *) (n) + 1); \                                          *((uint8_t *) (x) + 1) = *((const uint8_t *) (n) + 1); \
Line 154  typedef struct tagRawPacket { Line 158  typedef struct tagRawPacket {
  * return: NULL error or not enough space, !=NULL next position   * return: NULL error or not enough space, !=NULL next position
  */   */
 uint8_t *rpack_align_and_reserve(rpack_t * __restrict rp, size_t siz);  uint8_t *rpack_align_and_reserve(rpack_t * __restrict rp, size_t siz);
   /*
    * rpack_next() - Get and set current position
    *
    * @rp = raw packet
    * @after_len = move aligned current position after length
    * return: NULL error or current position
    */
   uint8_t *rpack_next(rpack_t * __restrict rp, size_t after_len);
   /*
    * rpack_rnext() - Get and set raw current position
    *
    * @rp = raw packet
    * @after_len = !=0 move current position after length
    * return: NULL error or raw current position
    */
   uint8_t *rpack_rnext(rpack_t * __restrict rp, size_t after_len);
   
 /*  /*
  * rpack_create() - Allocate & init raw packet structure   * rpack_create() - Allocate & init raw packet structure
Line 210  uint8_t rpack_uint8(rpack_t * __restrict rp, uint8_t * Line 230  uint8_t rpack_uint8(rpack_t * __restrict rp, uint8_t *
  *   *
  * @rp = raw buffer   * @rp = raw buffer
  * @n = set value if !=NULL   * @n = set value if !=NULL
 * @be = extract in big-endian * @be = byte order [-1 little endian, 1 big endian and 0 host order]
  * return: -1 error or get value   * return: -1 error or get value
  */   */
 uint16_t rpack_uint16(rpack_t * __restrict rp, uint16_t * __restrict n, int be);  uint16_t rpack_uint16(rpack_t * __restrict rp, uint16_t * __restrict n, int be);
Line 219  uint16_t rpack_uint16(rpack_t * __restrict rp, uint16_ Line 239  uint16_t rpack_uint16(rpack_t * __restrict rp, uint16_
  *   *
  * @rp = raw buffer   * @rp = raw buffer
  * @n = set value if !=NULL   * @n = set value if !=NULL
 * @be = extract in big-endian * @be = byte order [-1 little endian, 1 big endian and 0 host order]
  * return: -1 error or get value   * return: -1 error or get value
  */   */
 uint16_t rpack_ruint16(rpack_t * __restrict rp, uint16_t * __restrict n, int be);  uint16_t rpack_ruint16(rpack_t * __restrict rp, uint16_t * __restrict n, int be);
Line 228  uint16_t rpack_ruint16(rpack_t * __restrict rp, uint16 Line 248  uint16_t rpack_ruint16(rpack_t * __restrict rp, uint16
  *   *
  * @rp = raw buffer   * @rp = raw buffer
  * @n = set value if !=NULL   * @n = set value if !=NULL
 * @be = extract in big-endian * @be = byte order [-1 little endian, 1 big endian and 0 host order]
  * return: -1 error or get value   * return: -1 error or get value
  */   */
 uint32_t rpack_uint24(rpack_t * __restrict rp, uint32_t * __restrict n, int be);  uint32_t rpack_uint24(rpack_t * __restrict rp, uint32_t * __restrict n, int be);
Line 237  uint32_t rpack_uint24(rpack_t * __restrict rp, uint32_ Line 257  uint32_t rpack_uint24(rpack_t * __restrict rp, uint32_
  *   *
  * @rp = raw buffer   * @rp = raw buffer
  * @n = set value if !=NULL   * @n = set value if !=NULL
 * @be = extract in big-endian * @be = byte order [-1 little endian, 1 big endian and 0 host order]
  * return: -1 error or get value   * return: -1 error or get value
  */   */
 uint32_t rpack_ruint24(rpack_t * __restrict rp, uint32_t * __restrict n, int be);  uint32_t rpack_ruint24(rpack_t * __restrict rp, uint32_t * __restrict n, int be);
Line 246  uint32_t rpack_ruint24(rpack_t * __restrict rp, uint32 Line 266  uint32_t rpack_ruint24(rpack_t * __restrict rp, uint32
  *   *
  * @rp = raw buffer   * @rp = raw buffer
  * @n = set value if !=NULL   * @n = set value if !=NULL
 * @be = extract in big-endian * @be = byte order [-1 little endian, 1 big endian and 0 host order]
  * return: -1 error or get value   * return: -1 error or get value
  */   */
 uint32_t rpack_uint32(rpack_t * __restrict rp, uint32_t * __restrict n, int be);  uint32_t rpack_uint32(rpack_t * __restrict rp, uint32_t * __restrict n, int be);
Line 255  uint32_t rpack_uint32(rpack_t * __restrict rp, uint32_ Line 275  uint32_t rpack_uint32(rpack_t * __restrict rp, uint32_
  *   *
  * @rp = raw buffer   * @rp = raw buffer
  * @n = set value if !=NULL   * @n = set value if !=NULL
 * @be = extract in big-endian * @be = byte order [-1 little endian, 1 big endian and 0 host order]
  * return: -1 error or get value   * return: -1 error or get value
  */   */
 uint32_t rpack_ruint32(rpack_t * __restrict rp, uint32_t * __restrict n, int be);  uint32_t rpack_ruint32(rpack_t * __restrict rp, uint32_t * __restrict n, int be);
Line 264  uint32_t rpack_ruint32(rpack_t * __restrict rp, uint32 Line 284  uint32_t rpack_ruint32(rpack_t * __restrict rp, uint32
  *   *
  * @rp = raw buffer   * @rp = raw buffer
  * @n = set value if !=NULL   * @n = set value if !=NULL
 * @be = extract in big-endian * @be = byte order [-1 little endian, 1 big endian and 0 host order]
  * return: -1 error or get value   * return: -1 error or get value
  */   */
 uint64_t rpack_uint64(rpack_t * __restrict rp, uint64_t * __restrict n, int be);  uint64_t rpack_uint64(rpack_t * __restrict rp, uint64_t * __restrict n, int be);
Line 273  uint64_t rpack_uint64(rpack_t * __restrict rp, uint64_ Line 293  uint64_t rpack_uint64(rpack_t * __restrict rp, uint64_
  *   *
  * @rp = raw buffer   * @rp = raw buffer
  * @n = set value if !=NULL   * @n = set value if !=NULL
 * @be = extract in big-endian * @be = byte order [-1 little endian, 1 big endian and 0 host order]
  * return: -1 error or get value   * return: -1 error or get value
  */   */
 uint64_t rpack_ruint64(rpack_t * __restrict rp, uint64_t * __restrict n, int be);  uint64_t rpack_ruint64(rpack_t * __restrict rp, uint64_t * __restrict n, int be);

Removed from v.1.8.2.2  
changed lines
  Added in v.1.9


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