more cosmetic fixes

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2409 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
David Lawrence Ramsey 2005-03-21 06:33:41 +00:00
parent b9dec213be
commit afbcf68c1a
4 changed files with 7 additions and 4 deletions

View File

@ -6,6 +6,9 @@ CVS code -
- files.c: - files.c:
do_browser() do_browser()
- Rename variable lineno to fileline to avoid confusion. (DLR) - 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 GNU nano 1.3.6 - 2005.03.20
- General: - General:

View File

@ -48,7 +48,7 @@
#ifdef BROKEN_REGEXEC #ifdef BROKEN_REGEXEC
#undef 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 #endif
/* Set a default value for PATH_MAX, so we can use it in lines like /* Set a default value for PATH_MAX, so we can use it in lines like
@ -82,7 +82,7 @@
#endif #endif
#define gettext_noop(string) (string) #define gettext_noop(string) (string)
#define N_(string) gettext_noop(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 <stddef.h>
#include <sys/types.h> #include <sys/types.h>

View File

@ -532,7 +532,7 @@ void free_history(historyheadtype *h);
/* Public functions in utils.c. */ /* Public functions in utils.c. */
#ifdef HAVE_REGEX_H #ifdef HAVE_REGEX_H
#ifdef BROKEN_REGEXEC #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); regmatch_t pmatch[], int eflags);
#endif #endif
int regexp_bol_or_eol(const regex_t *preg, const char *string); int regexp_bol_or_eol(const regex_t *preg, const char *string);

View File

@ -36,7 +36,7 @@
#ifdef HAVE_REGEX_H #ifdef HAVE_REGEX_H
#ifdef BROKEN_REGEXEC #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) regmatch_t pmatch[], int eflags)
{ {
if (string != NULL && *string != '\0') if (string != NULL && *string != '\0')