X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Fecoli_node_int.h;h=b64c60c2e5b723dc417f0a01c81ede13a22089e9;hb=3e3a8cd1d91a60f04d876afd4e4867be610b94a5;hp=b8715297d2f12302ae17f6e395dd5efc81876220;hpb=a936ea741c1135e46e04b4dd75b95adc2ac201cb;p=protos%2Flibecoli.git diff --git a/lib/ecoli_node_int.h b/lib/ecoli_node_int.h index b871529..b64c60c 100644 --- a/lib/ecoli_node_int.h +++ b/lib/ecoli_node_int.h @@ -1,28 +1,5 @@ -/* - * Copyright (c) 2016, Olivier MATZ - * - * 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 */ #ifndef ECOLI_NODE_INT_ @@ -32,16 +9,22 @@ #include -// XXX remove min, max, base from new(), and add ec_node_int_set_limits() + -// XXX ec_node_int_set_base() ? +/* ec_node("int", ...) can be used too + * default is no limit, base 10 */ struct ec_node *ec_node_int(const char *id, int64_t min, int64_t max, unsigned int base); -int64_t ec_node_int_getval(struct ec_node *node, const char *str); + +int ec_node_int_getval(const struct ec_node *node, const char *str, + int64_t *result); + + struct ec_node *ec_node_uint(const char *id, uint64_t min, uint64_t max, unsigned int base); -uint64_t ec_node_uint_getval(struct ec_node *node, const char *str); + +int ec_node_uint_getval(const struct ec_node *node, const char *str, + uint64_t *result); #endif