Use the same macro names as dbuffs

diff --git a/src/lib/json/json.c b/src/lib/json/json.c
index d7f00e88895b969f2dfb34e94538177463671ce3..e2a15b0d04b5bfe411100d5f7769d3b35524f340 100644 (file)
--- a/src/lib/json/json.c
+++ b/src/lib/json/json.c
@@ -450,7 +450,7 @@ static int json_afrom_value_box(TALLOC_CTX *ctx, json_object **out,
  */
 static inline ssize_t attr_name_with_prefix(fr_sbuff_t *out, fr_dict_attr_t const *da, fr_json_format_t const *format)
 {
-       fr_sbuff_t our_out = FR_SBUFF_NO_ADVANCE(out);
+       fr_sbuff_t our_out = FR_SBUFF(out);
 
        if (!out) return 0;
 

diff --git a/src/lib/server/cond_tokenize.c b/src/lib/server/cond_tokenize.c
index 0294fee021c6cfba3e6c4054e11fe7807b662a0a..3542c19f452514d67149335a64be2db84d881b77 100644 (file)
--- a/src/lib/server/cond_tokenize.c
+++ b/src/lib/server/cond_tokenize.c
@@ -80,7 +80,7 @@ size_t cond_cmp_op_table_len = NUM_ELEMENTS(cond_cmp_op_table);
  */
 ssize_t cond_print(fr_sbuff_t *out, fr_cond_t const *in)
 {
-       fr_sbuff_t              our_out = FR_SBUFF_NO_ADVANCE(out);
+       fr_sbuff_t              our_out = FR_SBUFF(out);
        fr_cond_t const         *c = in;
 
        while (c) {
@@ -968,7 +968,7 @@ static ssize_t cond_tokenize_operand(fr_cond_t *c, tmpl_t **out,
                                                L("||"),                /* Logical operator */
                                        );
 
-       fr_sbuff_t                      our_in = FR_SBUFF_NO_ADVANCE(in);
+       fr_sbuff_t                      our_in = FR_SBUFF(in);
        fr_sbuff_marker_t               m;
        tmpl_t                          *vpt;
        fr_token_t                      type;
@@ -1128,7 +1128,7 @@ static ssize_t cond_tokenize(TALLOC_CTX *ctx, fr_cond_t **out,
                             CONF_SECTION *cs, fr_sbuff_t *in, int brace,
                             tmpl_rules_t const *t_rules)
 {
-       fr_sbuff_t              our_in = FR_SBUFF_NO_ADVANCE(in);
+       fr_sbuff_t              our_in = FR_SBUFF(in);
        ssize_t                 slen;
        fr_cond_t               *c;
 

diff --git a/src/lib/server/exec.c b/src/lib/server/exec.c
index 325e1b1b0b1497169448f0d5eb73105bf720b35b..a7f7da3045b216a0d582818edea1856c90420e35 100644 (file)
--- a/src/lib/server/exec.c
+++ b/src/lib/server/exec.c
@@ -129,7 +129,7 @@ static int exec_pair_to_env(char **env_p, size_t env_len, fr_sbuff_t *env_sbuff,
        fr_dcursor_t            cursor;
        fr_dict_attr_t const    *da;
        fr_pair_t               *vp;
-       fr_sbuff_t              sbuff = FR_SBUFF_COPY(env_sbuff);
+       fr_sbuff_t              sbuff = FR_SBUFF_BIND_CURRENT(env_sbuff);
 
        /*
         *      Set up the environment variables in the

diff --git a/src/lib/server/map.c b/src/lib/server/map.c
index 201e3e5a51aab9b8408491b22ddeb15a899bb69a..9fc79561588a912699d27d7b15112b831110c350 100644 (file)
--- a/src/lib/server/map.c
+++ b/src/lib/server/map.c
@@ -324,7 +324,7 @@ ssize_t map_afrom_substr(TALLOC_CTX *ctx, map_t **out, map_t **parent_p, fr_sbuf
        fr_token_t              token;
        map_t                   *map;
        bool                    is_child;
-       fr_sbuff_t              our_in = FR_SBUFF_NO_ADVANCE(in);
+       fr_sbuff_t              our_in = FR_SBUFF(in);
        fr_sbuff_marker_t       m_lhs, m_rhs, m_op;
        fr_sbuff_term_t const   *tt = p_rules ? p_rules->terminals : NULL;
        map_t                   *parent, *new_parent;
@@ -1922,7 +1922,7 @@ finish:
  */
 ssize_t map_print(fr_sbuff_t *out, map_t const *map)
 {
-       fr_sbuff_t      our_out = FR_SBUFF_NO_ADVANCE(out);
+       fr_sbuff_t      our_out = FR_SBUFF(out);
 
        MAP_VERIFY(map);
 

diff --git a/src/lib/server/tmpl_tokenize.c b/src/lib/server/tmpl_tokenize.c
index ad73b8fb09b3596b4c9e80e1a47c231fb145216c..fa24bde4e6bb45b2609e193e712b3e40b627510a 100644 (file)
--- a/src/lib/server/tmpl_tokenize.c
+++ b/src/lib/server/tmpl_tokenize.c
@@ -1233,7 +1233,7 @@ static tmpl_attr_filter_t tmpl_attr_parse_filter(tmpl_attr_error_t *err, tmpl_at
        default:
        {
                fr_sbuff_parse_error_t  sberr = FR_SBUFF_PARSE_OK;
-               fr_sbuff_t tmp = FR_SBUFF_NO_ADVANCE(name);
+               fr_sbuff_t tmp = FR_SBUFF(name);
 
                if (fr_sbuff_out(&sberr, &ar->num, &tmp) == 0) {
                        if (sberr == FR_SBUFF_PARSE_ERROR_NOT_FOUND) {
@@ -1937,7 +1937,7 @@ ssize_t tmpl_afrom_attr_substr(TALLOC_CTX *ctx, tmpl_attr_error_t *err,
        int             ret;
        size_t          list_len;
        tmpl_t          *vpt;
-       fr_sbuff_t      our_name = FR_SBUFF_NO_ADVANCE(name);   /* Take a local copy in case we need to back track */
+       fr_sbuff_t      our_name = FR_SBUFF(name);      /* Take a local copy in case we need to back track */
        bool            ref_prefix = false;
        bool            is_raw = false;
 
@@ -2136,7 +2136,7 @@ ssize_t tmpl_afrom_attr_str(TALLOC_CTX *ctx, tmpl_attr_error_t *err,
 static ssize_t tmpl_afrom_bool_substr(TALLOC_CTX *ctx, tmpl_t **out, fr_sbuff_t *in,
                                      fr_sbuff_parse_rules_t const *p_rules)
 {
-       fr_sbuff_t      our_in = FR_SBUFF_NO_ADVANCE(in);
+       fr_sbuff_t      our_in = FR_SBUFF(in);
        bool            a_bool;
        tmpl_t          *vpt;
 
@@ -2174,7 +2174,7 @@ static ssize_t tmpl_afrom_bool_substr(TALLOC_CTX *ctx, tmpl_t **out, fr_sbuff_t
 static ssize_t tmpl_afrom_octets_substr(TALLOC_CTX *ctx, tmpl_t **out, fr_sbuff_t *in,
                                        fr_sbuff_parse_rules_t const *p_rules)
 {
-       fr_sbuff_t      our_in = FR_SBUFF_NO_ADVANCE(in);
+       fr_sbuff_t      our_in = FR_SBUFF(in);
        tmpl_t          *vpt;
        char            *hex;
        size_t          binlen, len;
@@ -2234,7 +2234,7 @@ static ssize_t tmpl_afrom_ipv4_substr(TALLOC_CTX *ctx, tmpl_t **out, fr_sbuff_t
                                      fr_sbuff_parse_rules_t const *p_rules)
 {
        tmpl_t          *vpt;
-       fr_sbuff_t      our_in = FR_SBUFF_NO_ADVANCE(in);
+       fr_sbuff_t      our_in = FR_SBUFF(in);
        uint8_t         octet;
        fr_type_t       type;
 
@@ -2301,7 +2301,7 @@ static ssize_t tmpl_afrom_ipv6_substr(TALLOC_CTX *ctx, tmpl_t **out, fr_sbuff_t
                                      fr_sbuff_parse_rules_t const *p_rules)
 {
        tmpl_t                  *vpt;
-       fr_sbuff_t              our_in = FR_SBUFF_NO_ADVANCE(in);
+       fr_sbuff_t              our_in = FR_SBUFF(in);
        fr_sbuff_marker_t       m;
        fr_type_t               type;
        size_t                  len;
@@ -2418,7 +2418,7 @@ static ssize_t tmpl_afrom_ether_substr(TALLOC_CTX *ctx, tmpl_t **out, fr_sbuff_t
                                       fr_sbuff_parse_rules_t const *p_rules)
 {
        tmpl_t                  *vpt;
-       fr_sbuff_t              our_in = FR_SBUFF_NO_ADVANCE(in);
+       fr_sbuff_t              our_in = FR_SBUFF(in);
        uint8_t                 buff[6];
        fr_dbuff_t              dbuff;
        fr_value_box_t          *vb;
@@ -2485,7 +2485,7 @@ static ssize_t tmpl_afrom_integer_substr(TALLOC_CTX *ctx, tmpl_t **out, fr_sbuff
                                         fr_sbuff_parse_rules_t const *p_rules)
 {
        tmpl_t  *vpt;
-       fr_sbuff_t      our_in = FR_SBUFF_NO_ADVANCE(in);
+       fr_sbuff_t      our_in = FR_SBUFF(in);
        ssize_t         slen;
        fr_value_box_t  *vb;
 
@@ -2589,7 +2589,7 @@ ssize_t tmpl_afrom_substr(TALLOC_CTX *ctx, tmpl_t **out,
                          fr_sbuff_parse_rules_t const *p_rules,
                          tmpl_rules_t const *t_rules)
 {
-       fr_sbuff_t      our_in = FR_SBUFF_NO_ADVANCE(in);
+       fr_sbuff_t      our_in = FR_SBUFF(in);
 
        ssize_t         slen;
        char            *str;
@@ -2866,7 +2866,7 @@ ssize_t tmpl_afrom_substr(TALLOC_CTX *ctx, tmpl_t **out,
  */
 ssize_t tmpl_cast_from_substr(fr_type_t *out, fr_sbuff_t *in)
 {
-       fr_sbuff_t              our_in = FR_SBUFF_NO_ADVANCE(in);
+       fr_sbuff_t              our_in = FR_SBUFF(in);
        fr_sbuff_marker_t       m;
        fr_type_t               cast = FR_TYPE_NULL;
        ssize_t                 slen;
@@ -3668,7 +3668,7 @@ ssize_t tmpl_attr_print(fr_sbuff_t *out, tmpl_t const *vpt, tmpl_attr_prefix_t a
        tmpl_attr_t             *ar = NULL;
        fr_da_stack_t           stack;
        char                    printed_rr = false;
-       fr_sbuff_t              our_out = FR_SBUFF_NO_ADVANCE(out);
+       fr_sbuff_t              our_out = FR_SBUFF(out);
 
        if (unlikely(!vpt)) return 0;
 
@@ -3890,7 +3890,7 @@ ssize_t tmpl_attr_print(fr_sbuff_t *out, tmpl_t const *vpt, tmpl_attr_prefix_t a
 ssize_t tmpl_print(fr_sbuff_t *out, tmpl_t const *vpt,
                   tmpl_attr_prefix_t ar_prefix, fr_sbuff_escape_rules_t const *e_rules)
 {
-       fr_sbuff_t      our_out = FR_SBUFF_NO_ADVANCE(out);
+       fr_sbuff_t      our_out = FR_SBUFF(out);
 
        if (unlikely(!vpt)) return 0;
 
@@ -3969,7 +3969,7 @@ ssize_t tmpl_print(fr_sbuff_t *out, tmpl_t const *vpt,
  */
 ssize_t tmpl_print_quoted(fr_sbuff_t *out, tmpl_t const *vpt, tmpl_attr_prefix_t ar_prefix)
 {
-       fr_sbuff_t our_out = FR_SBUFF_NO_ADVANCE(out);
+       fr_sbuff_t our_out = FR_SBUFF(out);
 
        char quote = fr_token_quote[vpt->quote];
 

diff --git a/src/lib/unlang/xlat_builtin.c b/src/lib/unlang/xlat_builtin.c
index 7386425b5dfbfecafcd88f5b450d9dcca5197231..811c32dfdd4665341cd97eb6c41b8613570b914a 100644 (file)
--- a/src/lib/unlang/xlat_builtin.c
+++ b/src/lib/unlang/xlat_builtin.c
@@ -1428,7 +1428,7 @@ static xlat_action_t xlat_func_lpad(UNUSED TALLOC_CTX *ctx, fr_dcursor_t *out,
                fr_sbuff_init(&sbuff, buff, pad_len + 1);
                fr_sbuff_marker(&m_data, &sbuff);
                fr_sbuff_advance(&m_data, pad_len - len);       /* Mark where we want the data to go */
-               fr_sbuff_move(&FR_SBUFF_NO_ADVANCE(&m_data), &FR_SBUFF_NO_ADVANCE(&sbuff), len); /* Shift the data */
+               fr_sbuff_move(&FR_SBUFF(&m_data), &FR_SBUFF(&sbuff), len); /* Shift the data */
 
                if (fill_len == 1) {
                        memset(fr_sbuff_current(&sbuff), *fill_str, fr_sbuff_ahead(&m_data));

diff --git a/src/lib/unlang/xlat_tokenize.c b/src/lib/unlang/xlat_tokenize.c
index 0baedcd5ea2010bf076fddaf42755df06ef50830..6f6181e39aa67304f4f365f369e82d6ca4ba7f5a 100644 (file)
--- a/src/lib/unlang/xlat_tokenize.c
+++ b/src/lib/unlang/xlat_tokenize.c
@@ -1270,7 +1270,7 @@ ssize_t xlat_tokenize_ephemeral(TALLOC_CTX *ctx, xlat_exp_t **head, xlat_flags_t
                                fr_sbuff_t *in,
                                fr_sbuff_parse_rules_t const *p_rules, tmpl_rules_t const *t_rules)
 {
-       fr_sbuff_t      our_in = FR_SBUFF_NO_ADVANCE(in);
+       fr_sbuff_t      our_in = FR_SBUFF(in);
        xlat_flags_t    tmp_flags = {};
 
        if (!flags) flags = &tmp_flags;
@@ -1321,7 +1321,7 @@ ssize_t xlat_tokenize_ephemeral(TALLOC_CTX *ctx, xlat_exp_t **head, xlat_flags_t
 ssize_t xlat_tokenize_argv(TALLOC_CTX *ctx, xlat_exp_t **head, xlat_flags_t *flags, fr_sbuff_t *in,
                           fr_sbuff_parse_rules_t const *p_rules, tmpl_rules_t const *t_rules)
 {
-       fr_sbuff_t                      our_in = FR_SBUFF_NO_ADVANCE(in);
+       fr_sbuff_t                      our_in = FR_SBUFF(in);
        ssize_t                         slen;
        fr_cursor_t                     cursor;
        fr_sbuff_marker_t               m;
@@ -1492,7 +1492,7 @@ ssize_t xlat_tokenize_argv(TALLOC_CTX *ctx, xlat_exp_t **head, xlat_flags_t *fla
 ssize_t xlat_tokenize(TALLOC_CTX *ctx, xlat_exp_t **head, xlat_flags_t *flags, fr_sbuff_t *in,
                      fr_sbuff_parse_rules_t const *p_rules, tmpl_rules_t const *t_rules)
 {
-       fr_sbuff_t      our_in = FR_SBUFF_NO_ADVANCE(in);
+       fr_sbuff_t      our_in = FR_SBUFF(in);
        xlat_flags_t    tmp_flags = {};
 
        if (!flags) flags = &tmp_flags;

diff --git a/src/lib/util/base16.c b/src/lib/util/base16.c
index db12794dd0a5a6fb96838118e29e5bed20971b3d..441e31b8bbf4442085763029924bae9ef6e31c59 100644 (file)
--- a/src/lib/util/base16.c
+++ b/src/lib/util/base16.c
@@ -114,7 +114,7 @@ uint8_t const fr_base16_alphabet_decode_mc[UINT8_MAX] = {
  */
 ssize_t fr_base16_encode_nstd(fr_sbuff_t *out, fr_dbuff_t *in, char const alphabet[static UINT8_MAX])
 {
-       fr_sbuff_t      our_out = FR_SBUFF_NO_ADVANCE(out);
+       fr_sbuff_t      our_out = FR_SBUFF(out);
        fr_dbuff_t      our_in = FR_DBUFF(in);
 
        while (fr_dbuff_extend(&our_in)) {
@@ -144,7 +144,7 @@ ssize_t fr_base16_encode_nstd(fr_sbuff_t *out, fr_dbuff_t *in, char const alphab
 ssize_t fr_base16_decode_nstd(fr_sbuff_parse_error_t *err, fr_dbuff_t *out, fr_sbuff_t *in,
                              bool no_trailing, uint8_t const alphabet[static UINT8_MAX])
 {
-       fr_sbuff_t      our_in = FR_SBUFF_NO_ADVANCE(in);
+       fr_sbuff_t      our_in = FR_SBUFF(in);
        fr_dbuff_t      our_out = FR_DBUFF(out);
 
        while (fr_sbuff_extend_lowat(NULL, &our_in, 2) >= 2) {

diff --git a/src/lib/util/base32.c b/src/lib/util/base32.c
index 87f69fbf5bcc204e3dde3cf3900b8656aa1ea667..164a010fc26bec5a908b1db71a34b4f2128f5189 100644 (file)
--- a/src/lib/util/base32.c
+++ b/src/lib/util/base32.c
@@ -191,7 +191,7 @@ uint8_t const fr_base32_hex_alphabet_decode[UINT8_MAX] = {
 ssize_t fr_base32_encode_nstd(fr_sbuff_t *out, fr_dbuff_t *in,
                              bool add_padding, char const alphabet[static UINT8_MAX])
 {
-       fr_sbuff_t              our_out = FR_SBUFF_NO_ADVANCE(out);
+       fr_sbuff_t              our_out = FR_SBUFF(out);
        fr_dbuff_t              our_in = FR_DBUFF(in);
 
        fr_strerror_const("Insufficient buffer space");
@@ -316,7 +316,7 @@ ssize_t fr_base32_encode_nstd(fr_sbuff_t *out, fr_dbuff_t *in,
 ssize_t fr_base32_decode_nstd(fr_sbuff_parse_error_t *err, fr_dbuff_t *out, fr_sbuff_t *in,
                              bool expect_padding, bool no_trailing, uint8_t const alphabet[static UINT8_MAX])
 {
-       fr_sbuff_t              our_in = FR_SBUFF_NO_ADVANCE(in);
+       fr_sbuff_t              our_in = FR_SBUFF(in);
        fr_dbuff_t              our_out = FR_DBUFF(out);
        fr_sbuff_marker_t       m_final;
        size_t                  len;

diff --git a/src/lib/util/base64.c b/src/lib/util/base64.c
index 30c5bc43774aae830728fcaa4802512b7956049a..fe486ce7706a5411060383917d0978f06b58c27b 100644 (file)
--- a/src/lib/util/base64.c
+++ b/src/lib/util/base64.c
@@ -327,7 +327,7 @@ uint8_t const fr_base64_url_alphabet_decode[UINT8_MAX] = {
 ssize_t fr_base64_encode_nstd(fr_sbuff_t *out, fr_dbuff_t *in,
                              bool add_padding, char const alphabet[static UINT8_MAX])
 {
-       fr_sbuff_t              our_out = FR_SBUFF_NO_ADVANCE(out);
+       fr_sbuff_t              our_out = FR_SBUFF(out);
        fr_dbuff_t              our_in = FR_DBUFF(in);
 
        fr_strerror_const("Insufficient buffer space");
@@ -402,7 +402,7 @@ ssize_t fr_base64_encode_nstd(fr_sbuff_t *out, fr_dbuff_t *in,
 ssize_t        fr_base64_decode_nstd(fr_sbuff_parse_error_t *err, fr_dbuff_t *out, fr_sbuff_t *in,
                              bool expect_padding, bool no_trailing, uint8_t const alphabet[static UINT8_MAX])
 {
-       fr_sbuff_t              our_in = FR_SBUFF_NO_ADVANCE(in);
+       fr_sbuff_t              our_in = FR_SBUFF(in);
        fr_dbuff_t              our_out = FR_DBUFF(out);
        fr_sbuff_marker_t       m_final;
        uint8_t                 pad;

diff --git a/src/lib/util/dict_print.c b/src/lib/util/dict_print.c
index d37371a0168a70f06d16e74834b042881345182b..69a0cb471a9749822e0c90386e7474223924644c 100644 (file)
--- a/src/lib/util/dict_print.c
+++ b/src/lib/util/dict_print.c
@@ -29,7 +29,7 @@ RCSID("$Id$")
 
 ssize_t fr_dict_attr_flags_print(fr_sbuff_t *out, fr_dict_t const *dict, fr_type_t type, fr_dict_attr_flags_t const *flags)
 {
-       fr_sbuff_t      our_out = FR_SBUFF_NO_ADVANCE(out);
+       fr_sbuff_t      our_out = FR_SBUFF(out);
 
 #define FLAG_SET(_flag) if (flags->_flag) FR_SBUFF_IN_STRCPY_LITERAL_RETURN(&our_out, STRINGIFY(_flag)",")
 
@@ -113,7 +113,7 @@ ssize_t fr_dict_attr_oid_print(fr_sbuff_t *out,
        int                     i;
        int                     depth = 0;
        fr_da_stack_t           da_stack;
-       fr_sbuff_t              our_out = FR_SBUFF_NO_ADVANCE(out);
+       fr_sbuff_t              our_out = FR_SBUFF(out);
 
        /*
         *      If the ancestor and the DA match, there's

diff --git a/src/lib/util/dict_util.c b/src/lib/util/dict_util.c
index 4befd63fb14c956387ae042b2b2d7bc7dd50e75e..7a714168c898762086c57cc57ee8411809dc77a3 100644 (file)
--- a/src/lib/util/dict_util.c
+++ b/src/lib/util/dict_util.c
@@ -1949,7 +1949,7 @@ ssize_t dict_by_protocol_substr(fr_dict_attr_err_t *err,
        fr_dict_t               *dict;
        size_t                  len;
        char                    buffer[FR_DICT_ATTR_MAX_NAME_LEN + 1 + 1];      /* +1 \0 +1 for "too long" */
-       fr_sbuff_t              our_name = FR_SBUFF_NO_ADVANCE(name);
+       fr_sbuff_t              our_name = FR_SBUFF(name);
 
        if (!dict_gctx || !name || !out) {
                if (err) *err = FR_DICT_ATTR_EINVAL;
@@ -2282,7 +2282,7 @@ ssize_t dict_attr_search(fr_dict_attr_err_t *err, fr_dict_attr_t const **out,
        fr_dict_t               *dict = NULL;
 
        ssize_t                 slen = 0;
-       fr_sbuff_t              our_in = FR_SBUFF_NO_ADVANCE(in);
+       fr_sbuff_t              our_in = FR_SBUFF(in);
 
        if (internal && !dict_gctx->internal) internal = false;
 
@@ -2379,7 +2379,7 @@ do { \
        _in = _n; \
 } while (0)
 
-               our_in = FR_SBUFF_NO_ADVANCE(in);
+               our_in = FR_SBUFF(in);
                fr_sbuff_marker(&start, &our_in);
 
                list = talloc_strdup(NULL, "");
@@ -2426,7 +2426,7 @@ ssize_t dict_attr_search_qualified(fr_dict_attr_err_t *err, fr_dict_attr_t const
                                   bool internal, bool foreign,
                                   dict_attr_resolve_func_t func)
 {
-       fr_sbuff_t              our_in = FR_SBUFF_NO_ADVANCE(in);
+       fr_sbuff_t              our_in = FR_SBUFF(in);
        fr_dict_attr_err_t      our_err;
        fr_dict_t               *initial;
        ssize_t                 slen;
@@ -2648,7 +2648,7 @@ ssize_t fr_dict_attr_by_name_substr(fr_dict_attr_err_t *err, fr_dict_attr_t cons
        size_t                  len;
        fr_dict_attr_t const    *ref;
        char                    buffer[FR_DICT_ATTR_MAX_NAME_LEN + 1 + 1];      /* +1 \0 +1 for "too long" */
-       fr_sbuff_t              our_name = FR_SBUFF_NO_ADVANCE(name);
+       fr_sbuff_t              our_name = FR_SBUFF(name);
        fr_hash_table_t         *namespace;
        *out = NULL;
 

diff --git a/src/lib/util/pair_print.c b/src/lib/util/pair_print.c
index 2eb8243540bd9c33e7903e26598cf3ae35bf6cfd..32e071d840d7e0f144266db8ea41e3f9c8fad084 100644 (file)
--- a/src/lib/util/pair_print.c
+++ b/src/lib/util/pair_print.c
@@ -61,7 +61,7 @@ ssize_t fr_pair_print_value_quoted(fr_sbuff_t *out, fr_pair_t const *vp, fr_toke
                 *      Serialize all child VPs as full quoted
                 *      <pair> = ["]<child>["]
                 */
-               our_out = FR_SBUFF_NO_ADVANCE(out);
+               our_out = FR_SBUFF(out);
                FR_SBUFF_IN_CHAR_RETURN(&our_out, '{', ' ');
                for (child = fr_pair_dcursor_init(&cursor, &vp->vp_group);
                     child != NULL;
@@ -100,7 +100,7 @@ ssize_t fr_pair_print_value_quoted(fr_sbuff_t *out, fr_pair_t const *vp, fr_toke
 ssize_t fr_pair_print(fr_sbuff_t *out, fr_pair_t const *parent, fr_pair_t const *vp)
 {
        char const              *token = NULL;
-       fr_sbuff_t              our_out = FR_SBUFF_NO_ADVANCE(out);
+       fr_sbuff_t              our_out = FR_SBUFF(out);
        fr_dict_attr_t const    *parent_da = NULL;
 
        PAIR_VERIFY(vp);

diff --git a/src/lib/util/regex.c b/src/lib/util/regex.c
index 64f0095ed8e8e1349790ecbff0641346e2b9366a..291d4d148ea678566c4e6ba0c588c5c86ad528c7 100644 (file)
--- a/src/lib/util/regex.c
+++ b/src/lib/util/regex.c
@@ -1238,7 +1238,7 @@ fr_regmatch_t *regex_match_data_alloc(TALLOC_CTX *ctx, uint32_t count)
 ssize_t regex_flags_parse(int *err, fr_regex_flags_t *out, fr_sbuff_t *in,
                          fr_sbuff_term_t const *terminals, bool err_on_dup)
 {
-       fr_sbuff_t      our_in = FR_SBUFF_NO_ADVANCE(in);
+       fr_sbuff_t      our_in = FR_SBUFF(in);
 
        if (err) *err = 0;
 
@@ -1284,7 +1284,7 @@ ssize_t regex_flags_parse(int *err, fr_regex_flags_t *out, fr_sbuff_t *in,
  */
 ssize_t regex_flags_print(fr_sbuff_t *sbuff, fr_regex_flags_t const flags[static REGEX_FLAG_BUFF_SIZE])
 {
-       fr_sbuff_t our_sbuff = FR_SBUFF_NO_ADVANCE(sbuff);
+       fr_sbuff_t our_sbuff = FR_SBUFF(sbuff);
 
 #define DO_REGEX_FLAG(_f, _c) \
        if (flags->_f) FR_SBUFF_IN_CHAR_RETURN(&our_sbuff, _c)

diff --git a/src/lib/util/sbuff.c b/src/lib/util/sbuff.c
index e243840506847ebab633820d54d7973fbaf1d67f..7449c9c2ba530e619388405888f27929cc87300b 100644 (file)
--- a/src/lib/util/sbuff.c
+++ b/src/lib/util/sbuff.c
@@ -628,7 +628,7 @@ fr_sbuff_term_t *fr_sbuff_terminals_amerge(TALLOC_CTX *ctx, fr_sbuff_term_t cons
  */
 size_t fr_sbuff_out_bstrncpy(fr_sbuff_t *out, fr_sbuff_t *in, size_t len)
 {
-       fr_sbuff_t      our_in = FR_SBUFF_COPY(in);
+       fr_sbuff_t      our_in = FR_SBUFF_BIND_CURRENT(in);
        size_t          remaining;
 
        CHECK_SBUFF_INIT(in);
@@ -666,7 +666,7 @@ done:
  */
 ssize_t fr_sbuff_out_bstrncpy_exact(fr_sbuff_t *out, fr_sbuff_t *in, size_t len)
 {
-       fr_sbuff_t              our_in = FR_SBUFF_NO_ADVANCE(in);
+       fr_sbuff_t              our_in = FR_SBUFF(in);
        size_t                  remaining;
        fr_sbuff_marker_t       m;
 
@@ -718,7 +718,7 @@ ssize_t fr_sbuff_out_bstrncpy_exact(fr_sbuff_t *out, fr_sbuff_t *in, size_t len)
 size_t fr_sbuff_out_bstrncpy_allowed(fr_sbuff_t *out, fr_sbuff_t *in, size_t len,
                                     bool const allowed[static UINT8_MAX + 1])
 {
-       fr_sbuff_t      our_in = FR_SBUFF_COPY(in);
+       fr_sbuff_t      our_in = FR_SBUFF_BIND_CURRENT(in);
 
        CHECK_SBUFF_INIT(in);
 
@@ -765,7 +765,7 @@ size_t fr_sbuff_out_bstrncpy_until(fr_sbuff_t *out, fr_sbuff_t *in, size_t len,
                                   fr_sbuff_term_t const *tt,
                                   fr_sbuff_unescape_rules_t const *u_rules)
 {
-       fr_sbuff_t      our_in = FR_SBUFF_COPY(in);
+       fr_sbuff_t      our_in = FR_SBUFF_BIND_CURRENT(in);
        bool            do_escape = false;              /* Track state across extensions */
 
        uint8_t         idx[UINT8_MAX + 1];             /* Fast path index */
@@ -855,7 +855,7 @@ size_t fr_sbuff_out_unescape_until(fr_sbuff_t *out, fr_sbuff_t *in, size_t len,
 
        CHECK_SBUFF_INIT(in);
 
-       our_in = FR_SBUFF_NO_ADVANCE(in);
+       our_in = FR_SBUFF(in);
 
        /*
         *      Chunk tracking...
@@ -1075,7 +1075,7 @@ size_t fr_sbuff_out_##_name(fr_sbuff_parse_error_t *err, _type *out, fr_sbuff_t
        char            *end, *a_end; \
        size_t          len; \
        long long       num; \
-       fr_sbuff_t      our_in = FR_SBUFF_NO_ADVANCE(in); \
+       fr_sbuff_t      our_in = FR_SBUFF(in); \
        len = fr_sbuff_out_bstrncpy(&FR_SBUFF_IN(buff, sizeof(buff)), &our_in, _max_char); \
        if (len == 0) { \
                if (err) *err = FR_SBUFF_PARSE_ERROR_NOT_FOUND; \
@@ -1130,7 +1130,7 @@ size_t fr_sbuff_out_##_name(fr_sbuff_parse_error_t *err, _type *out, fr_sbuff_t
        char                    *end, *a_end; \
        size_t                  len; \
        unsigned long long      num; \
-       fr_sbuff_t              our_in = FR_SBUFF_NO_ADVANCE(in); \
+       fr_sbuff_t              our_in = FR_SBUFF(in); \
        len = fr_sbuff_out_bstrncpy(&FR_SBUFF_IN(buff, sizeof(buff)), &our_in, _max_char); \
        if (len == 0) { \
                if (err) *err = FR_SBUFF_PARSE_ERROR_NOT_FOUND; \
@@ -1189,7 +1189,7 @@ size_t fr_sbuff_out_##_name(fr_sbuff_parse_error_t *err, _type *out, fr_sbuff_t
 { \
        char            buff[_max_char + 1]; \
        char            *end; \
-       fr_sbuff_t      our_in = FR_SBUFF_NO_ADVANCE(in); \
+       fr_sbuff_t      our_in = FR_SBUFF(in); \
        size_t          len; \
        _type           res; \
        len = fr_sbuff_out_bstrncpy_allowed(&FR_SBUFF_OUT(buff, sizeof(buff)), &our_in, SIZE_MAX, sbuff_char_class_float); \
@@ -1482,7 +1482,7 @@ ssize_t fr_sbuff_in_escape(fr_sbuff_t *sbuff, char const *in, size_t inlen, fr_s
 
        if (unlikely(sbuff->is_const)) return 0;
 
-       our_sbuff = FR_SBUFF_NO_ADVANCE(sbuff);
+       our_sbuff = FR_SBUFF(sbuff);
        while (p < end) {
                size_t  clen;
                uint8_t c = (uint8_t)*p;
@@ -1725,7 +1725,7 @@ size_t fr_sbuff_adv_until(fr_sbuff_t *sbuff, size_t len, fr_sbuff_term_t const *
  */
 char *fr_sbuff_adv_to_chr_utf8(fr_sbuff_t *sbuff, size_t len, char const *chr)
 {
-       fr_sbuff_t      our_sbuff = FR_SBUFF_NO_ADVANCE(sbuff);
+       fr_sbuff_t      our_sbuff = FR_SBUFF(sbuff);
        size_t          total = 0;
        size_t          clen = strlen(chr);
 
@@ -1770,7 +1770,7 @@ char *fr_sbuff_adv_to_chr_utf8(fr_sbuff_t *sbuff, size_t len, char const *chr)
  */
 char *fr_sbuff_adv_to_chr(fr_sbuff_t *sbuff, size_t len, char c)
 {
-       fr_sbuff_t      our_sbuff = FR_SBUFF_NO_ADVANCE(sbuff);
+       fr_sbuff_t      our_sbuff = FR_SBUFF(sbuff);
        size_t          total = 0;
 
        CHECK_SBUFF_INIT(sbuff);
@@ -1806,7 +1806,7 @@ char *fr_sbuff_adv_to_chr(fr_sbuff_t *sbuff, size_t len, char c)
  */
 char *fr_sbuff_adv_to_str(fr_sbuff_t *sbuff, size_t len, char const *needle, size_t needle_len)
 {
-       fr_sbuff_t      our_sbuff = FR_SBUFF_NO_ADVANCE(sbuff);
+       fr_sbuff_t      our_sbuff = FR_SBUFF(sbuff);
        size_t          total = 0;
 
        CHECK_SBUFF_INIT(sbuff);
@@ -1859,7 +1859,7 @@ char *fr_sbuff_adv_to_str(fr_sbuff_t *sbuff, size_t len, char const *needle, siz
  */
 char *fr_sbuff_adv_to_strcase(fr_sbuff_t *sbuff, size_t len, char const *needle, size_t needle_len)
 {
-       fr_sbuff_t      our_sbuff = FR_SBUFF_NO_ADVANCE(sbuff);
+       fr_sbuff_t      our_sbuff = FR_SBUFF(sbuff);
        size_t          total = 0;
 
        CHECK_SBUFF_INIT(sbuff);

diff --git a/src/lib/util/sbuff.h b/src/lib/util/sbuff.h
index 147718b613f426c8d7c0011346c5eca5cf5ddab1..bedea33ef094ad6ce58e75e0838428023fd865bf 100644 (file)
--- a/src/lib/util/sbuff.h
+++ b/src/lib/util/sbuff.h
@@ -370,7 +370,7 @@ do { \
  *
  * @param[in] _sbuff_or_marker to make an ephemeral copy of.
  */
-#define FR_SBUFF_NO_ADVANCE(_sbuff_or_marker) \
+#define FR_SBUFF(_sbuff_or_marker) \
 _Generic((_sbuff_or_marker), \
        fr_sbuff_t *            : ((fr_sbuff_t){ \
                                        .buff           = ((fr_sbuff_t *)(_sbuff_or_marker))->buff, \
@@ -401,7 +401,7 @@ _Generic((_sbuff_or_marker), \
  *
  * @param[in] _sbuff   to make an ephemeral copy of.
  */
-#define FR_SBUFF_COPY(_sbuff_or_marker) \
+#define FR_SBUFF_BIND_CURRENT(_sbuff_or_marker) \
 _Generic((_sbuff_or_marker), \
        fr_sbuff_t *            : ((fr_sbuff_t){ \
                                        .buff           = ((fr_sbuff_t *)(_sbuff_or_marker))->buff, \

diff --git a/src/lib/util/sbuff_tests.c b/src/lib/util/sbuff_tests.c
index 7ee3389832e61865c21aeaa2f96378b2697a0ea8..5760569c02aca499457c486c8ee83642ee472aef 100644 (file)
--- a/src/lib/util/sbuff_tests.c
+++ b/src/lib/util/sbuff_tests.c
@@ -741,7 +741,7 @@ static void test_no_advance(void)
 
        TEST_CASE("Copy 5 bytes to out - no advance");
        TEST_CHECK(sbuff.p == sbuff.start);
-       slen = fr_sbuff_out_bstrncpy_exact(&FR_SBUFF_OUT(out, sizeof(out)), &FR_SBUFF_NO_ADVANCE(&sbuff), 5);
+       slen = fr_sbuff_out_bstrncpy_exact(&FR_SBUFF_OUT(out, sizeof(out)), &FR_SBUFF(&sbuff), 5);
        TEST_CHECK(slen == 5);
        TEST_CHECK(strcmp(out, "i am ") == 0);
        TEST_CHECK(sbuff.p == sbuff.start);
@@ -868,7 +868,7 @@ static void test_talloc_extend_multi_level(void)
        TEST_SBUFF_USED(&sbuff_0, 0);
        TEST_SBUFF_LEN(&sbuff_0, 1);
 
-       sbuff_1 = FR_SBUFF_COPY(&sbuff_0);
+       sbuff_1 = FR_SBUFF_BIND_CURRENT(&sbuff_0);
        TEST_CASE("Check sbuff_1 has extend fields set");
        TEST_CHECK(sbuff_0.extend == sbuff_1.extend);
        TEST_CHECK(sbuff_0.uctx == sbuff_1.uctx);
@@ -919,7 +919,7 @@ static void test_talloc_extend_with_marker(void)
        TEST_CHECK((marker_0.p - sbuff_0.start) == 1);
 
        TEST_CASE("Print string - Copy sbuff");
-       sbuff_1 = FR_SBUFF_COPY(&sbuff_0);      /* Dup sbuff_0 */
+       sbuff_1 = FR_SBUFF_BIND_CURRENT(&sbuff_0);      /* Dup sbuff_0 */
        TEST_CHECK(sbuff_0.p == sbuff_1.start);
        fr_sbuff_marker(&marker_1, &sbuff_1);
 

diff --git a/src/lib/util/value.c b/src/lib/util/value.c
index 9b2833d06dcc99a0a4eece5c3fe6ed71b8b1f67b..228583506b8a9cb68e78d5c70ab7e7c784970426 100644 (file)
--- a/src/lib/util/value.c
+++ b/src/lib/util/value.c
@@ -4779,7 +4779,7 @@ finish:
  */
 ssize_t fr_value_box_print(fr_sbuff_t *out, fr_value_box_t const *data, fr_sbuff_escape_rules_t const *e_rules)
 {
-       fr_sbuff_t      our_out = FR_SBUFF_NO_ADVANCE(out);
+       fr_sbuff_t      our_out = FR_SBUFF(out);
 
        char            buf[1024];      /* Interim buffer to use with poorly behaved printing functions */
 
@@ -5075,7 +5075,7 @@ done:
  */
 ssize_t fr_value_box_print_quoted(fr_sbuff_t *out, fr_value_box_t const *data, fr_token_t quote)
 {
-       fr_sbuff_t      our_out = FR_SBUFF_NO_ADVANCE(out);
+       fr_sbuff_t      our_out = FR_SBUFF(out);
 
        if (quote == T_BARE_WORD) return fr_value_box_print(out, data, NULL);
 
@@ -5119,7 +5119,7 @@ ssize_t fr_value_box_list_concat_as_string(bool *tainted, fr_sbuff_t *sbuff, fr_
                                           char const *sep, size_t sep_len, fr_sbuff_escape_rules_t const *e_rules,
                                           fr_value_box_list_action_t proc_action, bool flatten)
 {
-       fr_sbuff_t our_sbuff = FR_SBUFF_NO_ADVANCE(sbuff);
+       fr_sbuff_t our_sbuff = FR_SBUFF(sbuff);
        ssize_t slen;
 
        if (fr_dlist_empty(list)) return 0;