| Patrick Williams | ddad1a1 | 2017-02-23 20:36:32 -0600 | [diff] [blame^] | 1 | yp-tools: avoid fatal cast warning |
| 2 | |
| 3 | The way casting is done, we will get a fatal alignment warning on some |
| 4 | architectures. This patch cheats our way around this. |
| 5 | |
| 6 | We also eliminate an unused constant which causes a fatal warning. |
| 7 | |
| 8 | Upstream-status: Inappropriate [code does not exist in version 4.x] |
| 9 | |
| 10 | Signed-off-by: Joe Slater <jslater@windriver.com> |
| 11 | |
| 12 | --- a/lib/do_ypcall.c |
| 13 | +++ b/lib/do_ypcall.c |
| 14 | @@ -44,7 +44,6 @@ struct dom_binding |
| 15 | typedef struct dom_binding dom_binding; |
| 16 | |
| 17 | static const struct timeval RPCTIMEOUT = {25, 0}; |
| 18 | -static const struct timeval UDPTIMEOUT = {5, 0}; |
| 19 | static int const MAXTRIES = 2; |
| 20 | static pthread_mutex_t ypbindlist_lock = PTHREAD_MUTEX_INITIALIZER; |
| 21 | static dom_binding *ypbindlist = NULL; |
| 22 | @@ -381,7 +380,7 @@ __ypclnt_call (u_long prog, xdrproc_t xa |
| 23 | |
| 24 | int |
| 25 | do_ypcall (const char *domain, u_long prog, xdrproc_t xargs, |
| 26 | - caddr_t req, xdrproc_t xres, caddr_t resp) |
| 27 | + caddr_t req, xdrproc_t xres, void *resp) |
| 28 | { |
| 29 | dom_binding *ydb; |
| 30 | int status; |
| 31 | @@ -450,7 +449,7 @@ do_ypcall (const char *domain, u_long pr |
| 32 | /* Like do_ypcall, but translate the status value if necessary. */ |
| 33 | int |
| 34 | do_ypcall_tr (const char *domain, u_long prog, xdrproc_t xargs, |
| 35 | - caddr_t req, xdrproc_t xres, caddr_t resp) |
| 36 | + caddr_t req, xdrproc_t xres, void *resp) |
| 37 | { |
| 38 | int status = do_ypcall (domain, prog, xargs, req, xres, resp); |
| 39 | if (status == YPERR_SUCCESS) |
| 40 | --- a/lib/internal.h |
| 41 | +++ b/lib/internal.h |
| 42 | @@ -17,8 +17,8 @@ |
| 43 | #define _INTERNAL_H_ |
| 44 | |
| 45 | extern int do_ypcall (const char *domain, u_long prog, xdrproc_t xargs, |
| 46 | - caddr_t req, xdrproc_t xres, caddr_t resp); |
| 47 | + caddr_t req, xdrproc_t xres, void *resp); |
| 48 | extern int do_ypcall_tr (const char *domain, u_long prog, xdrproc_t xargs, |
| 49 | - caddr_t req, xdrproc_t xres, caddr_t resp); |
| 50 | + caddr_t req, xdrproc_t xres, void *resp); |
| 51 | extern int yp_maplist (const char *, struct ypmaplist **); |
| 52 | #endif |