-/*
- * Copyright (c) 2016, Olivier MATZ <zer0@droids-corp.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the University of California, Berkeley nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2016, Olivier MATZ <zer0@droids-corp.org>
*/
#include <sys/types.h>
#include <ecoli_test.h>
#include <ecoli_vec.h>
+EC_LOG_TYPE_REGISTER(vec);
+
struct ec_vec {
size_t len;
size_t size;
struct ec_vec *vec;
if (elt_size == 0) {
- errno = -EINVAL;
+ errno = EINVAL;
return NULL;
}
new_vec = ec_realloc(vec->vec, vec->elt_size * (vec->len + 1));
if (new_vec == NULL)
return -ENOMEM;
+ vec->size = vec->len + 1;
}
vec->vec = new_vec;
- if (vec->copy)
- vec->copy(get_obj(vec, vec->len), ptr);
- else
- memcpy(get_obj(vec, vec->len), ptr, vec->elt_size);
+ memcpy(get_obj(vec, vec->len), ptr, vec->elt_size);
vec->len++;
return 0;
size_t ec_vec_len(const struct ec_vec *vec)
{
+ if (vec == NULL)
+ return 0;
+
return vec->len;
}
int ec_vec_get(void *ptr, const struct ec_vec *vec, size_t idx)
{
- if (vec == NULL || idx >= vec->len)
- return -EINVAL;
+ if (vec == NULL || idx >= vec->len) {
+ errno = EINVAL;
+ return -1;
+ }
- if (vec->copy)
- vec->copy(ptr, get_obj(vec, idx));
- else
- memcpy(ptr, get_obj(vec, idx), vec->elt_size);
+ memcpy(ptr, get_obj(vec, idx), vec->elt_size);
return 0;
}
}
#define GOTO_FAIL do { \
- ec_log(EC_LOG_ERR, "%s:%d: test failed\n", \
+ EC_LOG(EC_LOG_ERR, "%s:%d: test failed\n", \
__FILE__, __LINE__); \
goto fail; \
} while(0)
if (ec_vec_get(&vals, vec, 0) < 0)
GOTO_FAIL;
- if (strcmp(vals, "0"))
+ if (vals == NULL || strcmp(vals, "0"))
GOTO_FAIL;
if (ec_vec_get(&vals, vec, 1) < 0)
GOTO_FAIL;
- if (strcmp(vals, "1"))
+ if (vals == NULL || strcmp(vals, "1"))
GOTO_FAIL;
if (ec_vec_get(&vals, vec, 2) < 0)
GOTO_FAIL;
- if (strcmp(vals, "2"))
+ if (vals == NULL || strcmp(vals, "2"))
GOTO_FAIL;
ec_vec_free(vec);