From 0dfb113b47d958093e6ae086c9695e5be83b24b8 Mon Sep 17 00:00:00 2001 From: Robin Haberkorn Date: Sun, 28 Jun 2026 02:35:17 +0200 Subject: teco_globber_t is ported from GRegex to terex It's now a private struct, so we can include the regex_t wihout having to draw in the terex headers everywhere. --- src/glob.h | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'src/glob.h') diff --git a/src/glob.h b/src/glob.h index 995437c..0da32b5 100644 --- a/src/glob.h +++ b/src/glob.h @@ -23,18 +23,13 @@ #include "sciteco.h" #include "parser.h" -typedef struct { - GFileTest test; - gchar *dirname; - GDir *dir; - GRegex *pattern; -} teco_globber_t; +typedef struct teco_globber_t teco_globber_t; -void teco_globber_init(teco_globber_t *ctx, const gchar *pattern, GFileTest test); +teco_globber_t *teco_globber_new(const gchar *pattern, GFileTest test); gchar *teco_globber_next(teco_globber_t *ctx); -void teco_globber_clear(teco_globber_t *ctx); +void teco_globber_free(teco_globber_t *ctx); -G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(teco_globber_t, teco_globber_clear); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(teco_globber_t, teco_globber_free); /** @static @memberof teco_globber_t */ static inline gboolean @@ -44,7 +39,6 @@ teco_globber_is_pattern(const gchar *str) } gchar *teco_globber_escape_pattern(const gchar *pattern); -GRegex *teco_globber_compile_pattern(const gchar *pattern); /* in cmdline.c */ gboolean teco_state_expectglob_process_edit_cmd(teco_machine_main_t *ctx, teco_machine_t *parent_ctx, -- cgit v1.2.3