DGNum/libubox
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

blob: switch to ISC license, switch blob_{get,put}_int* to _u*, add wrappers

Browse source
This commit is contained in:
Felix Fietkau 2011-11-10 09:05:33 +01:00
parent fc20c7a031
commit a654d2f42b
2 changed files with 54 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
blob.c
View file

@ -3,14 +3,17 @@
* *
* Copyright (C) 2010 Felix Fietkau <nbd@openwrt.org> * Copyright (C) 2010 Felix Fietkau <nbd@openwrt.org>
* *
* This program is free software; you can redistribute it and/or modify * Permission to use, copy, modify, and/or distribute this software for any
* it under the terms of the GNU Lesser General Public License version 2.1 * purpose with or without fee is hereby granted, provided that the above
* as published by the Free Software Foundation * copyright notice and this permission notice appear in all copies.
* *
* This program is distributed in the hope that it will be useful, * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* but WITHOUT ANY WARRANTY; without even the implied warranty of * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
* GNU General Public License for more details. * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
#include "blob.h" #include "blob.h"

56
blob.h
View file

@ -3,14 +3,17 @@
* *
* Copyright (C) 2010 Felix Fietkau <nbd@openwrt.org> * Copyright (C) 2010 Felix Fietkau <nbd@openwrt.org>
* *
* This program is free software; you can redistribute it and/or modify * Permission to use, copy, modify, and/or distribute this software for any
* it under the terms of the GNU Lesser General Public License version 2.1 * purpose with or without fee is hereby granted, provided that the above
* as published by the Free Software Foundation * copyright notice and this permission notice appear in all copies.
* *
* This program is distributed in the hope that it will be useful, * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* but WITHOUT ANY WARRANTY; without even the implied warranty of * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
* GNU General Public License for more details. * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
#ifndef _BLOB_H__ #ifndef _BLOB_H__
@ -146,7 +149,7 @@ blob_len(const struct blob_attr *attr)
} }
/* /*
* blob_pad_len: returns the complete length of an attribute (including the header) * blob_raw_len: returns the complete length of an attribute (including the header)
*/ */
static inline unsigned int static inline unsigned int
blob_raw_len(const struct blob_attr *attr) blob_raw_len(const struct blob_attr *attr)
@ -192,6 +195,30 @@ blob_get_u64(const struct blob_attr *attr)
return be64_to_cpu(*tmp); return be64_to_cpu(*tmp);
} }
static inline int8_t
blob_get_int8(const struct blob_attr *attr)
{
return blob_get_u8(attr);
}
static inline int16_t
blob_get_int16(const struct blob_attr *attr)
{
return blob_get_u16(attr);
}
static inline int32_t
blob_get_int32(const struct blob_attr *attr)
{
return blob_get_u32(attr);
}
static inline int64_t
blob_get_int64(const struct blob_attr *attr)
{
return blob_get_u64(attr);
}
static inline const char * static inline const char *
blob_get_string(const struct blob_attr *attr) blob_get_string(const struct blob_attr *attr)
{ {
@ -223,32 +250,37 @@ blob_put_string(struct blob_buf *buf, int id, const char *str)
} }
static inline struct blob_attr * static inline struct blob_attr *
blob_put_int8(struct blob_buf *buf, int id, uint8_t val) blob_put_u8(struct blob_buf *buf, int id, uint8_t val)
{ {
return blob_put(buf, id, &val, sizeof(val)); return blob_put(buf, id, &val, sizeof(val));
} }
static inline struct blob_attr * static inline struct blob_attr *
blob_put_int16(struct blob_buf *buf, int id, uint16_t val) blob_put_u16(struct blob_buf *buf, int id, uint16_t val)
{ {
val = cpu_to_be16(val); val = cpu_to_be16(val);
return blob_put(buf, id, &val, sizeof(val)); return blob_put(buf, id, &val, sizeof(val));
} }
static inline struct blob_attr * static inline struct blob_attr *
blob_put_int32(struct blob_buf *buf, int id, uint32_t val) blob_put_u32(struct blob_buf *buf, int id, uint32_t val)
{ {
val = cpu_to_be32(val); val = cpu_to_be32(val);
return blob_put(buf, id, &val, sizeof(val)); return blob_put(buf, id, &val, sizeof(val));
} }
static inline struct blob_attr * static inline struct blob_attr *
blob_put_int64(struct blob_buf *buf, int id, uint64_t val) blob_put_u64(struct blob_buf *buf, int id, uint64_t val)
{ {
val = cpu_to_be64(val); val = cpu_to_be64(val);
return blob_put(buf, id, &val, sizeof(val)); return blob_put(buf, id, &val, sizeof(val));
} }
#define blob_put_int8 blob_put_u8
#define blob_put_int16 blob_put_u16
#define blob_put_int32 blob_put_u32
#define blob_put_int64 blob_put_u64
#define __blob_for_each_attr(pos, attr, rem) \ #define __blob_for_each_attr(pos, attr, rem) \
for (pos = (void *) attr; \ for (pos = (void *) attr; \
rem > 0 && (blob_pad_len(pos) <= rem) && \ rem > 0 && (blob_pad_len(pos) <= rem) && \