X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=blob.c;h=e74f07fcb606b80e28c8293a9f5dae108a7140d9;hp=e59a6d00ac2e842555ba7004bc53c4ef9e612a61;hb=f5245f9887af7bf8f3468bf0ebca3c031da346ed;hpb=309d7d456f1934a75755504791ad23554a3359d6 diff --git a/blob.c b/blob.c index e59a6d0..e74f07f 100644 --- a/blob.c +++ b/blob.c @@ -3,14 +3,17 @@ * * Copyright (C) 2010 Felix Fietkau * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 2.1 - * as published by the Free Software Foundation + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * 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" @@ -67,6 +70,7 @@ blob_add(struct blob_buf *buf, struct blob_attr *pos, int id, int payload) } blob_init(attr, id, payload + sizeof(struct blob_attr)); + blob_fill_pad(attr); return attr; } @@ -91,7 +95,7 @@ blob_buf_free(struct blob_buf *buf) buf->buflen = 0; } -static void +void blob_fill_pad(struct blob_attr *attr) { char *buf = (char *) attr; @@ -109,7 +113,6 @@ blob_set_raw_len(struct blob_attr *attr, unsigned int len) len &= BLOB_ATTR_LEN_MASK; len |= (id << BLOB_ATTR_ID_SHIFT) & BLOB_ATTR_ID_MASK; attr->id_len = cpu_to_be32(len); - blob_fill_pad(attr); } struct blob_attr * @@ -240,3 +243,17 @@ blob_attr_equal(const struct blob_attr *a1, const struct blob_attr *a2) return !memcmp(a1, a2, blob_pad_len(a1)); } + +struct blob_attr * +blob_memdup(struct blob_attr *attr) +{ + struct blob_attr *ret; + int size = blob_pad_len(attr); + + ret = malloc(size); + if (!ret) + return NULL; + + memcpy(ret, attr, size); + return ret; +}