Refactor: move check_max_len_valid function to existing utils module

Also, type the argument properly.

Signed-off-by: Jan Pokorný <jpokorny@redhat.com>

Author: jnpkrn

src/ticket.c

@@ -31,31 +31,22 @@
 #else
 #include "alt/range2random_glib.h"
 #endif
-#include "ticket.h"
+#include "booth.h"
 #include "config.h"
-#include "pacemaker.h"
+#include "handler.h"
 #include "inline-fn.h"
 #include "log.h"
-#include "booth.h"
+#include "manual.h"
+#include "pacemaker.h"
 #include "raft.h"
-#include "handler.h"
 #include "request.h"
-#include "manual.h"
+#include "ticket.h"
+#include "utils.h"
 
 #define TK_LINE			256
 
 extern int TIME_RES;
 
-/* Untrusted input, must fit (incl. \0) in a buffer of max chars. */
-int check_max_len_valid(const char *s, int max)
-{
-	int i;
-	for(i=0; i<max; i++)
-		if (s[i] == 0)
-			return 1;
-	return 0;
-}
-
 int find_ticket_by_name(struct booth_config *conf_ptr,
                         const char *ticket, struct ticket_config **found)
 {

src/ticket.h

@@ -164,8 +164,6 @@ void update_ticket_state(struct booth_config *conf_ptr,
  */
 int setup_ticket(struct booth_config *conf_ptr);
 
-int check_max_len_valid(const char *s, int max);
-
 /**
  * @internal
  * Pick a ticket structure based on given name

src/utils.c

@@ -11,6 +11,14 @@
 #include <stdlib.h>  /* fprintf */
 #include <string.h>  /* strlen, strncpy */
 
+int check_max_len_valid(const char *s, size_t max)
+{
+	for (size_t i = 0; i < max; i++)
+		if (s[i] == '\0')
+			return 1;
+	return 0;
+}
+
 void safe_copy(char *dest, const char *value, size_t buflen,
                const char *description)
 {

src/utils.h

@@ -9,6 +9,17 @@
 
 #include <stdlib.h>  /* size_t */
 
+/**
+ * @internal
+ * For an untrusted string, check that it terminates in @p max initial bytes
+ *
+ * @param[in] s string at input
+ * @param[in] max delimits the termination seeking this big initial chunk
+ *
+ * @return 1 if early termination satisified, 0 if not
+ */
+int check_max_len_valid(const char *s, size_t max);
+
 /**
  * @internal
  * Like strncpy, but with explicit protection and better diagnostics