extmod/modre: Rename re_exec to re_exec_helper to avoid clash on BSD.

easytarget · dpgeorge · commit 4fdad8eabef1 · 2024-07-15T10:57:44.000+10:00
The `re_exec` symbol is the name of a FreeBSD regex function, so needs to be renamed to avoid a clash when building on FreeBSD. (This clash was fixed once before but then accidentally reintroduced by the u-module renaming in 7f5d5c7.) Fixes issue micropython#15430. clarify as helper function
diff --git a/extmod/modre.c b/extmod/modre.c
@@ -194,7 +194,8 @@ static void re_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t
     mp_printf(print, "<re %p>", self);
 }
 
-static mp_obj_t re_exec(bool is_anchored, uint n_args, const mp_obj_t *args) {
+// Note: this function can't be named re_exec because it may clash with system headers, eg on FreeBSD
+static mp_obj_t re_exec_helper(bool is_anchored, uint n_args, const mp_obj_t *args) {
     (void)n_args;
     mp_obj_re_t *self;
     if (mp_obj_is_type(args[0], (mp_obj_type_t *)&re_type)) {
@@ -223,12 +224,12 @@ static mp_obj_t re_exec(bool is_anchored, uint n_args, const mp_obj_t *args) {
 }
 
 static mp_obj_t re_match(size_t n_args, const mp_obj_t *args) {
-    return re_exec(true, n_args, args);
+    return re_exec_helper(true, n_args, args);
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(re_match_obj, 2, 4, re_match);
 
 static mp_obj_t re_search(size_t n_args, const mp_obj_t *args) {
-    return re_exec(false, n_args, args);
+    return re_exec_helper(false, n_args, args);
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(re_search_obj, 2, 4, re_search);
 

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,8 @@ static void re_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t`
`194`	`194`	`mp_printf(print, "<re %p>", self);`
`195`	`195`	`}`
`196`	`196`
`197`		`-static mp_obj_t re_exec(bool is_anchored, uint n_args, const mp_obj_t *args) {`
	`197`	`+// Note: this function can't be named re_exec because it may clash with system headers, eg on FreeBSD`
	`198`	`+static mp_obj_t re_exec_helper(bool is_anchored, uint n_args, const mp_obj_t *args) {`
`198`	`199`	`(void)n_args;`
`199`	`200`	`mp_obj_re_t *self;`
`200`	`201`	`if (mp_obj_is_type(args[0], (mp_obj_type_t *)&re_type)) {`
`@@ -223,12 +224,12 @@ static mp_obj_t re_exec(bool is_anchored, uint n_args, const mp_obj_t *args) {`
`223`	`224`	`}`
`224`	`225`
`225`	`226`	`static mp_obj_t re_match(size_t n_args, const mp_obj_t *args) {`
`226`		`- return re_exec(true, n_args, args);`
	`227`	`+ return re_exec_helper(true, n_args, args);`
`227`	`228`	`}`
`228`	`229`	`MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(re_match_obj, 2, 4, re_match);`
`229`	`230`
`230`	`231`	`static mp_obj_t re_search(size_t n_args, const mp_obj_t *args) {`
`231`		`- return re_exec(false, n_args, args);`
	`232`	`+ return re_exec_helper(false, n_args, args);`
`232`	`233`	`}`
`233`	`234`	`MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(re_search_obj, 2, 4, re_search);`
`234`	`235`