Libc-825.24.tar.gz

[apple/libc.git] / regex / FreeBSD / regerror.c

diff --git a/regex/FreeBSD/regerror.c b/regex/FreeBSD/regerror.c
index 9364bd43296169e34fde599491993f0c6f35a2f4..a22066c6e4c4102f129e6a165a561dc5663f9370 100644 (file)
--- a/regex/FreeBSD/regerror.c
+++ b/regex/FreeBSD/regerror.c
@@ -81,10 +81,10 @@ static char *regatoi(const regex_t *preg, char *localbuf);
  = #define     REG_ATOI        255     // convert name to number (!)
  = #define     REG_ITOA        0400    // convert number to name (!)
  */
  = #define     REG_ATOI        255     // convert name to number (!)
  = #define     REG_ITOA        0400    // convert number to name (!)
  */

-static struct rerr {
+static const struct rerr {

        int code;
        int code;

-       char *name;
-       char *explain;
+       const char *name;
+       const char *explain;

 } rerrs[] = {
        {REG_NOMATCH,   "REG_NOMATCH",  "regexec() failed to match"},
        {REG_BADPAT,    "REG_BADPAT",   "invalid regular expression"},
 } rerrs[] = {
        {REG_NOMATCH,   "REG_NOMATCH",  "regexec() failed to match"},
        {REG_BADPAT,    "REG_BADPAT",   "invalid regular expression"},


@@ -117,10 +117,10 @@ regerror(int errcode,
         char * __restrict errbuf,
         size_t errbuf_size)
 {
         char * __restrict errbuf,
         size_t errbuf_size)
 {

-       struct rerr *r;
+       const struct rerr *r;

        size_t len;
        int target = errcode &~ REG_ITOA;
        size_t len;
        int target = errcode &~ REG_ITOA;

-       char *s;
+       const char *s;

        char convbuf[50];
 
        if (errcode == REG_ATOI)
        char convbuf[50];
 
        if (errcode == REG_ATOI)


@@ -161,7 +161,7 @@ regerror(int errcode,
 static char *
 regatoi(const regex_t *preg, char *localbuf)
 {
 static char *
 regatoi(const regex_t *preg, char *localbuf)
 {

-       struct rerr *r;
+       const struct rerr *r;

 
        for (r = rerrs; r->code != 0; r++)
                if (strcmp(r->name, preg->re_endp) == 0)
 
        for (r = rerrs; r->code != 0; r++)
                if (strcmp(r->name, preg->re_endp) == 0)