From afbcf68c1a935cc9b31a78a1448f459650713a58 Mon Sep 17 00:00:00 2001
From: David Lawrence Ramsey <pooka109@gmail.com>
Date: Mon, 21 Mar 2005 06:33:41 +0000
Subject: [PATCH] more cosmetic fixes
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2409 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---
ChangeLog | 3 +++
src/nano.h | 4 ++--
src/proto.h | 2 +-
src/utils.c | 2 +-
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 554eb9d1..14c8f206 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@ CVS code -
- files.c:
do_browser()
- Rename variable lineno to fileline to avoid confusion. (DLR)
+- utils.c:
+ regexec_safe()
+ - Rename to safe_regexec() for consistency. (DLR)
GNU nano 1.3.6 - 2005.03.20
- General:
diff --git a/src/nano.h b/src/nano.h
index f6ed4313..071bf80e 100644
--- a/src/nano.h
+++ b/src/nano.h
@@ -48,7 +48,7 @@
#ifdef BROKEN_REGEXEC
#undef regexec
-#define regexec(preg, string, nmatch, pmatch, eflags) regexec_safe(preg, string, nmatch, pmatch, eflags)
+#define regexec(preg, string, nmatch, pmatch, eflags) safe_regexec(preg, string, nmatch, pmatch, eflags)
#endif
/* Set a default value for PATH_MAX, so we can use it in lines like
@@ -82,7 +82,7 @@
#endif
#define gettext_noop(string) (string)
#define N_(string) gettext_noop(string)
- /* Mark a string that will be sent to gettext later. */
+ /* Mark a string that will be sent to gettext() later. */
#include <stddef.h>
#include <sys/types.h>
diff --git a/src/proto.h b/src/proto.h
index e7bc1590..03989ba7 100644
--- a/src/proto.h
+++ b/src/proto.h
@@ -532,7 +532,7 @@ void free_history(historyheadtype *h);
/* Public functions in utils.c. */
#ifdef HAVE_REGEX_H
#ifdef BROKEN_REGEXEC
-int regexec_safe(const regex_t *preg, const char *string, size_t nmatch,
+int safe_regexec(const regex_t *preg, const char *string, size_t nmatch,
regmatch_t pmatch[], int eflags);
#endif
int regexp_bol_or_eol(const regex_t *preg, const char *string);
diff --git a/src/utils.c b/src/utils.c
index cf0bed4b..ce21eced 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -36,7 +36,7 @@
#ifdef HAVE_REGEX_H
#ifdef BROKEN_REGEXEC
-int regexec_safe(const regex_t *preg, const char *string, size_t nmatch,
+int safe_regexec(const regex_t *preg, const char *string, size_t nmatch,
regmatch_t pmatch[], int eflags)
{
if (string != NULL && *string != '\0')
--
GitLab