projects
/
project
/
libubox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
utils.h: fix name collisions in __u_bswap16 with using "val" both inside the macro...
[project/libubox.git]
/
blob.c
diff --git
a/blob.c
b/blob.c
index
6d66fcd
..
faa3bb8
100644
(file)
--- a/
blob.c
+++ b/
blob.c
@@
-40,14
+40,14
@@
blob_init(struct blob_attr *attr, int id, unsigned int len)
static inline struct blob_attr *
offset_to_attr(struct blob_buf *buf, int offset)
{
static inline struct blob_attr *
offset_to_attr(struct blob_buf *buf, int offset)
{
- void *ptr = (char *)buf->buf + offset;
+ void *ptr = (char *)buf->buf + offset
- BLOB_COOKIE
;
return ptr;
}
static inline int
attr_to_offset(struct blob_buf *buf, struct blob_attr *attr)
{
return ptr;
}
static inline int
attr_to_offset(struct blob_buf *buf, struct blob_attr *attr)
{
- return (char *)attr - (char *) buf->buf;
+ return (char *)attr - (char *) buf->buf
+ BLOB_COOKIE
;
}
void
}
void
@@
-65,7
+65,7
@@
static struct blob_attr *
blob_add(struct blob_buf *buf, struct blob_attr *pos, int id, int payload)
{
int offset = attr_to_offset(buf, pos);
blob_add(struct blob_buf *buf, struct blob_attr *pos, int id, int payload)
{
int offset = attr_to_offset(buf, pos);
- int required = (offset + sizeof(struct blob_attr) + payload) - buf->buflen;
+ int required = (offset
- BLOB_COOKIE
+ sizeof(struct blob_attr) + payload) - buf->buflen;
struct blob_attr *attr;
if (required > 0) {
struct blob_attr *attr;
if (required > 0) {