d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make this code WARNS=6 clean again (after GCC 3.1.1 import).

Browse Source 
Submitted by:	Marius Strobl <marius@alchemy.franken.de>
This commit is contained in:
Ruslan Ermilov 2003-07-20 10:24:09 +00:00
parent e9043a12cc
commit ff572a5e73
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=117803
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bin/ed/Makefile
View File

@ -8,7 +8,6 @@ MLINKS= ed.1 red.1
.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
DISTRIBUTION=crypto
CFLAGS+=-DDES
WARNS= 2
DPADD= ${LIBCRYPTO}
LDADD= -lcrypto
.endif

26
bin/ed/re.c
View File

@ -41,10 +41,10 @@ const char *errmsg = "";
pattern_t *
get_compiled_pattern(void)
{
static pattern_t *exp = NULL;
static pattern_t *expr = NULL;
static char error[1024];
char *exps;
char *exprs;
char delimiter;
int n;
@ -52,27 +52,27 @@ get_compiled_pattern(void)
errmsg = "invalid pattern delimiter";
return NULL;
} else if (delimiter == '\n' || *++ibufp == '\n' || *ibufp == delimiter) {
if (!exp)
if (!expr)
errmsg = "no previous pattern";
return exp;
} else if ((exps = extract_pattern(delimiter)) == NULL)
return expr;
} else if ((exprs = extract_pattern(delimiter)) == NULL)
return NULL;
/* buffer alloc'd && not reserved */
if (exp && !patlock)
regfree(exp);
else if ((exp = (pattern_t *) malloc(sizeof(pattern_t))) == NULL) {
if (expr && !patlock)
regfree(expr);
else if ((expr = (pattern_t *) malloc(sizeof(pattern_t))) == NULL) {
fprintf(stderr, "%s\n", strerror(errno));
errmsg = "out of memory";
return NULL;
}
patlock = 0;
if ((n = regcomp(exp, exps, 0))) {
regerror(n, exp, error, sizeof error);
if ((n = regcomp(expr, exprs, 0))) {
regerror(n, expr, error, sizeof error);
errmsg = error;
free(exp);
return exp = NULL;
free(expr);
return expr = NULL;
}
return exp;
return expr;
}