rework to avoid intermediate function

Author: alandekok

src/lib/server/cf_util.c

@@ -2104,7 +2104,7 @@ void _cf_vlog_perr(fr_log_type_t type, CONF_ITEM const *ci, char const *file, in
 			char *first;
 
 			first = talloc_bstrdup(pool, prefix);
-			talloc_buffer_append_buffer(pool, first, f_rules->first_prefix);
+			MEM(talloc_strndup_append_buffer(first, f_rules->first_prefix, SIZE_MAX));
 
 			our_f_rules.first_prefix = first;
 		} else {
@@ -2118,7 +2118,7 @@ void _cf_vlog_perr(fr_log_type_t type, CONF_ITEM const *ci, char const *file, in
 			char *subsq;
 
 			subsq = talloc_bstrdup(pool, prefix);
-			talloc_buffer_append_buffer(pool, subsq, f_rules->subsq_prefix);
+			MEM(talloc_strndup_append_buffer(subsq, f_rules->subsq_prefix, SIZE_MAX));
 
 			our_f_rules.subsq_prefix = subsq;
 		} else {

src/lib/util/talloc.c

@@ -698,39 +698,6 @@ char *talloc_bstr_realloc(TALLOC_CTX *ctx, char *in, size_t inlen)
 	return n;
 }
 
-/** Concatenate to + from
- *
- * @param[in] ctx	to allocate realloced buffer in.
- * @param[in] to	talloc string buffer to append to.
- * @param[in] from	talloc string buffer to append.
- * @return
- *	- NULL if to or from are NULL or if the realloc fails.
- *	  Note: You'll still need to free to if this function
- *	  returns NULL.
- *	- The concatenation of to + from.  After this function
- *	  returns to may point to invalid memory and should
- *	  not be used.
- */
-char *talloc_buffer_append_buffer(TALLOC_CTX *ctx, char *to, char const *from)
-{
-	size_t to_len, from_len, total_len;
-	char *out;
-
-	if (!to || !from) return NULL;
-
-	to_len = talloc_array_length(to);
-	from_len = talloc_array_length(from);
-	total_len = to_len + (from_len - 1);
-
-	out = talloc_realloc(ctx, to, char, total_len);
-	if (!out) return NULL;
-
-	memcpy(out + (to_len - 1), from, from_len);
-	out[total_len - 1] = '\0';
-
-	return out;
-}
-
 /** Concatenate to + ...
  *
  * @param[in] ctx	to allocate realloced buffer in.

src/lib/util/talloc.h

@@ -28,6 +28,7 @@ RCSIDH(talloc_h, "$Id$")
 extern "C" {
 #endif
 
+#ifndef TALLOC_TYPE_SAFE
 #include <ctype.h>
 
 #ifdef HAVE_WDOCUMENTATION
@@ -139,6 +140,7 @@ static inline size_t talloc_strlen(char const *s)
 	char const *our_s = s;
 	return talloc_array_length(our_s) - 1;
 }
+
 #define talloc_strdup(_ctx, _str)	 talloc_typed_strdup((TALLOC_CTX *) (_ctx), _str)
 #define talloc_strndup(_ctx, _str, _len) talloc_typed_strndup((TALLOC_CTX *) (_ctx), _str, _len)
 #define talloc_asprintf 	talloc_typed_asprintf
@@ -212,6 +214,7 @@ void		*_talloc_realloc_zero(const void *ctx, void *ptr, size_t elem_size, unsign
     (_type *)_talloc_realloc_zero((_ctx), (_ptr), sizeof(_type), _count, #_type)
 
 /** @hidecallergraph */
+#ifndef TALLOC_TYPE_SAFE
 char		*talloc_typed_strdup(TALLOC_CTX *ctx, char const *p);
 
 char		*talloc_typed_strdup_buffer(TALLOC_CTX *ctx, char const *p);
@@ -223,6 +226,7 @@ char		*talloc_typed_asprintf(TALLOC_CTX *ctx, char const *fmt, ...) CC_HINT(form
 char		*talloc_typed_vasprintf(TALLOC_CTX *ctx, char const *fmt, va_list ap) CC_HINT(format (printf, 2, 0)) CC_HINT(nonnull (2));
 
 uint8_t		*talloc_typed_memdup(TALLOC_CTX *ctx, uint8_t const *in, size_t inlen);
+#endif
 
 char		*talloc_bstrdup(TALLOC_CTX *ctx, char const *in);
 
@@ -232,8 +236,6 @@ char		*talloc_bstr_append(TALLOC_CTX *ctx, char *to, char const *from, size_t fr
 
 char		*talloc_bstr_realloc(TALLOC_CTX *ctx, char *in, size_t inlen);
 
-char		*talloc_buffer_append_buffer(TALLOC_CTX *ctx, char *to, char const *from);
-
 char		*talloc_buffer_append_variadic_buffer(TALLOC_CTX *ctx, char *to, int argc, ...);
 
 int		talloc_memcmp_array(uint8_t const *a, uint8_t const *b);
@@ -265,6 +267,8 @@ typedef struct talloc_child_ctx_s TALLOC_CHILD_CTX;
 TALLOC_CHILD_CTX	*talloc_child_ctx_init(TALLOC_CTX *ctx);
 TALLOC_CHILD_CTX	*talloc_child_ctx_alloc(TALLOC_CHILD_CTX *parent) CC_HINT(nonnull);
 
+#endif
+
 #ifdef __cplusplus
 }
 #endif