projects
/
debian
/
amanda
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 2.5.1
[debian/amanda]
/
regex-src
/
regerror.c
diff --git
a/regex-src/regerror.c
b/regex-src/regerror.c
index 35cc1eba131a24c827725b5599d23e32eebf05be..1eab5cad84195b24312ed82a150ef1e92d65ad4d 100644
(file)
--- a/
regex-src/regerror.c
+++ b/
regex-src/regerror.c
@@
-1,11
+1,5
@@
-#include <sys/types.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#include <limits.h>
-#include <stdlib.h>
+#include "amanda.h"
#include <regex.h>
#include <regex.h>
-
#include "utils.h"
#include "regerror.ih"
#include "utils.h"
#include "regerror.ih"
@@
-61,11
+55,11
@@
static struct rerr {
*/
/* ARGSUSED */
size_t
*/
/* ARGSUSED */
size_t
-regerror(
errcode, preg, errbuf, errbuf_size)
-int errcode;
-const regex_t *preg;
-char *errbuf;
-size_t errbuf_size;
+regerror(
+ int errcode,
+ const regex_t *preg,
+ char * errbuf,
+ size_t errbuf_size)
{
register struct rerr *r;
register size_t len;
{
register struct rerr *r;
register size_t len;
@@
-74,7
+68,7
@@
size_t errbuf_size;
char convbuf[50];
if (errcode == REG_ATOI)
char convbuf[50];
if (errcode == REG_ATOI)
- s = regatoi(preg, convbuf,
sizeof
(convbuf));
+ s = regatoi(preg, convbuf,
SIZEOF
(convbuf));
else {
for (r = rerrs; r->code >= 0; r++)
if (r->code == target)
else {
for (r = rerrs; r->code >= 0; r++)
if (r->code == target)
@@
-82,13
+76,13
@@
size_t errbuf_size;
if (errcode®_ITOA) {
if (r->code >= 0) {
if (errcode®_ITOA) {
if (r->code >= 0) {
- strncpy(convbuf, r->name,
sizeof
(convbuf)-1);
- convbuf[
sizeof
(convbuf)-1] = '\0';
+ strncpy(convbuf, r->name,
SIZEOF
(convbuf)-1);
+ convbuf[
SIZEOF
(convbuf)-1] = '\0';
} else {
} else {
- snprintf(convbuf,
sizeof
(convbuf),
- "REG_0x%x", target);
+ snprintf(convbuf,
SIZEOF
(convbuf),
+ "REG_0x%x",
(unsigned)
target);
}
}
- assert(strlen(convbuf) <
sizeof
(convbuf));
+ assert(strlen(convbuf) <
SIZEOF
(convbuf));
s = convbuf;
} else
s = r->explain;
s = convbuf;
} else
s = r->explain;
@@
-96,12
+90,8
@@
size_t errbuf_size;
len = strlen(s) + 1;
if (errbuf_size > 0) {
len = strlen(s) + 1;
if (errbuf_size > 0) {
- if (errbuf_size > len)
- (void) strcpy(errbuf, s);
- else {
- (void) strncpy(errbuf, s, errbuf_size-1);
- errbuf[errbuf_size-1] = '\0';
- }
+ (void) strncpy(errbuf, s, errbuf_size-1);
+ errbuf[errbuf_size-1] = '\0';
}
return(len);
}
return(len);
@@
-109,19
+99,22
@@
size_t errbuf_size;
/*
- regatoi - internal routine to implement REG_ATOI
/*
- regatoi - internal routine to implement REG_ATOI
- == static char *regatoi(const regex_t *preg, char *localbuf,
in
t buflen);
+ == static char *regatoi(const regex_t *preg, char *localbuf,
size_
t buflen);
*/
static char *
*/
static char *
-regatoi(
preg, localbuf, buflen)
-const regex_t *preg;
-char *localbuf;
-int buflen;
+regatoi(
+ const regex_t * preg,
+ char * localbuf,
+ size_t buflen)
{
register struct rerr *r;
{
register struct rerr *r;
- for (r = rerrs; r->code >= 0; r++)
+ for (r = rerrs; r->code >= 0; r++) {
+ /*@ignore@*/
if (strcmp(r->name, preg->re_endp) == 0)
break;
if (strcmp(r->name, preg->re_endp) == 0)
break;
+ /*@end@*/
+ }
if (r->code < 0)
return("0");
if (r->code < 0)
return("0");