X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fofpbuf.c;h=0eed4284dc2e9baf32017791ba2ff5473ebac888;hb=7b3b5a5d5bdf87bfff9430b615bbc95ed9b6f1a8;hp=1b18b14adea1dd17c355730d68a63f3238bafa0c;hpb=da546e076495672ab67106bb6dbb42447c1a2d26;p=sliver-openvswitch.git diff --git a/lib/ofpbuf.c b/lib/ofpbuf.c index 1b18b14ad..0eed4284d 100644 --- a/lib/ofpbuf.c +++ b/lib/ofpbuf.c @@ -276,7 +276,7 @@ ofpbuf_resize__(struct ofpbuf *b, size_t new_headroom, size_t new_tailroom) break; case OFPBUF_STACK: - NOT_REACHED(); + OVS_NOT_REACHED(); case OFPBUF_STUB: b->source = OFPBUF_MALLOC; @@ -285,7 +285,7 @@ ofpbuf_resize__(struct ofpbuf *b, size_t new_headroom, size_t new_tailroom) break; default: - NOT_REACHED(); + OVS_NOT_REACHED(); } b->allocated = new_allocated; @@ -359,6 +359,24 @@ ofpbuf_padto(struct ofpbuf *b, size_t length) } } +/* Shifts all of the data within the allocated space in 'b' by 'delta' bytes. + * For example, a 'delta' of 1 would cause each byte of data to move one byte + * forward (from address 'p' to 'p+1'), and a 'delta' of -1 would cause each + * byte to move one byte backward (from 'p' to 'p-1'). */ +void +ofpbuf_shift(struct ofpbuf *b, int delta) +{ + ovs_assert(delta > 0 ? delta <= ofpbuf_tailroom(b) + : delta < 0 ? -delta <= ofpbuf_headroom(b) + : true); + + if (delta != 0) { + char *dst = (char *) b->data + delta; + memmove(dst, b->data, b->size); + b->data = dst; + } +} + /* Appends 'size' bytes of data to the tail end of 'b', reallocating and * copying its data if necessary. Returns a pointer to the first byte of the * new data, which is left uninitialized. */