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

Attempt to fix the numerous incompatible enum conversions in

Browse Source 
libexec/ypxfr in the least disruptive way.

MFC after:	1 week
This commit is contained in:
dim 2011-12-16 19:39:49 +00:00
parent 838b9f84ea
commit f5113f1990
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libexec/ypxfr/yp_dbwrite.c
View File

@ -58,10 +58,10 @@ yp_open_db_rw(const char *domain, const char *map, const int flags)
char buf[1025];
yp_errno = YP_TRUE;
yp_errno = YPXFR_SUCC;
if (map[0] == '.' || strchr(map, '/')) {
yp_errno = YP_BADARGS;
yp_errno = YPXFR_BADARGS;
return (NULL);
}
@ -73,13 +73,13 @@ yp_open_db_rw(const char *domain, const char *map, const int flags)
if (dbp == NULL) {
switch (errno) {
case ENOENT:
yp_errno = YP_NOMAP;
yp_errno = YPXFR_NOMAP;
break;
case EFTYPE:
yp_errno = YP_BADDB;
yp_errno = YPXFR_MADDR;
break;
default:
yp_errno = YP_YPERR;
yp_errno = YPXFR_YPERR;
break;
}
}

2
libexec/ypxfr/ypxfr_extern.h
View File

@ -46,7 +46,7 @@ extern BTREEINFO openinfo_b;
extern char *yp_dir;
extern int debug;
extern enum ypstat yp_errno;
extern ypxfrstat yp_errno;
extern void yp_error(const char *, ...);
extern int _yp_check(char **);
extern const char *ypxfrerr_string(ypxfrstat);

1
libexec/ypxfr/ypxfr_getmap.c
View File

@ -46,7 +46,6 @@ extern bool_t xdr_ypresp_all_seq(XDR *, unsigned long *);
int (*ypresp_allfn)();
void *ypresp_data;
extern DB *specdbp;
extern enum ypstat yp_errno;
/*
* This is largely the same as yp_all() except we do the transfer

2
libexec/ypxfr/ypxfr_main.c
View File

@ -88,7 +88,7 @@ ypxfr_exit(ypxfrstat retval, char *temp)
exit(1);
}
ypxfr_resp.status = retval;
ypxfr_resp.status = (yppush_status)retval;
if (yppushproc_xfrresp_1(&ypxfr_resp, clnt) == NULL) {
yp_error("%s", clnt_sperror(clnt, "callback failed"));