statd: Replace note() with xlog() in rpc.statd

[nfs-utils.git] / utils / statd / rmtcall.c

diff --git a/utils/statd/rmtcall.c b/utils/statd/rmtcall.c
index cc1a4a46dfc12301642ec64af7be11ed7173b03c..5700fc73c45a64f32f5cbeea724dcfbfd5d494a5 100644 (file)
--- a/utils/statd/rmtcall.c
+++ b/utils/statd/rmtcall.c
@@ -43,7 +43,6 @@
 #include "sm_inter.h"
 #include "statd.h"
 #include "notlist.h"
-#include "log.h"
 #include "ha-callout.h"
 
 #if SIZEOF_SOCKLEN_T - 0 == 0
@@ -81,7 +80,7 @@ statd_get_socket(void)
                if (sockfd >= 0) close(sockfd);
 
                if ((sockfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) {
-                       note(N_CRIT, "%s: Can't create socket: %m", __func__);
+                       xlog(L_ERROR, "%s: Can't create socket: %m", __func__);
                        return -1;
                }
 
@@ -91,7 +90,7 @@ statd_get_socket(void)
                sin.sin_addr.s_addr = INADDR_ANY;
 
                if (bindresvport(sockfd, &sin) < 0) {
-                       dprintf(N_WARNING, "%s: can't bind to reserved port",
+                       xlog(D_GENERAL, "%s: can't bind to reserved port",
                                        __func__);
                        break;
                }
@@ -150,7 +149,7 @@ xmit_call(struct sockaddr_in *sin,
 
        /* Encode the RPC header part and payload */
        if (!xdr_callmsg(xdrs, &mesg) || !func(xdrs, obj)) {
-               dprintf(N_WARNING, "%s: can't encode RPC message!", __func__);
+               xlog(D_GENERAL, "%s: can't encode RPC message!", __func__);
                xdr_destroy(xdrs);
                return 0;
        }
@@ -160,9 +159,9 @@ xmit_call(struct sockaddr_in *sin,
 
        if ((err = sendto(sockfd, msgbuf, msglen, 0,
                        (struct sockaddr *) sin, sizeof(*sin))) < 0) {
-               dprintf(N_WARNING, "%s: sendto failed: %m", __func__);
+               xlog_warn("%s: sendto failed: %m", __func__);
        } else if (err != msglen) {
-               dprintf(N_WARNING, "%s: short write: %m", __func__);
+               xlog_warn("%s: short write: %m", __func__);
        }
 
        xdr_destroy(xdrs);
@@ -182,7 +181,7 @@ recv_rply(struct sockaddr_in *sin, u_long *portp)
        /* Receive message */
        if ((msglen = recvfrom(sockfd, msgbuf, sizeof(msgbuf), 0,
                        (struct sockaddr *) sin, &alen)) < 0) {
-               dprintf(N_WARNING, "%s: recvfrom failed: %m", __func__);
+               xlog_warn("%s: recvfrom failed: %m", __func__);
                return NULL;
        }
 
@@ -194,19 +193,19 @@ recv_rply(struct sockaddr_in *sin, u_long *portp)
        mesg.rm_reply.rp_acpt.ar_results.proc = (xdrproc_t) xdr_void;
 
        if (!xdr_replymsg(xdrs, &mesg)) {
-               note(N_WARNING, "%s: can't decode RPC message!", __func__);
+               xlog_warn("%s: can't decode RPC message!", __func__);
                goto done;
        }
 
        if (mesg.rm_reply.rp_stat != 0) {
-               note(N_WARNING, "%s: [%s] RPC status %d", 
+               xlog_warn("%s: [%s] RPC status %d", 
                                __func__,
                                inet_ntoa(sin->sin_addr),
                                mesg.rm_reply.rp_stat);
                goto done;
        }
        if (mesg.rm_reply.rp_acpt.ar_stat != 0) {
-               note(N_WARNING, "%s: [%s] RPC status %d",
+               xlog_warn("%s: [%s] RPC status %d",
                                __func__,
                                inet_ntoa(sin->sin_addr),
                                mesg.rm_reply.rp_acpt.ar_stat);
@@ -224,14 +223,13 @@ recv_rply(struct sockaddr_in *sin, u_long *portp)
                        strncpy (addr, inet_ntoa(lp->addr),
                                 sizeof (addr) - 1);
                        addr [sizeof (addr) - 1] = '\0';
-                       dprintf(N_WARNING, "%s: address mismatch: "
+                       xlog_warn("%s: address mismatch: "
                                "expected %s, got %s", __func__,
                                addr, inet_ntoa(sin->sin_addr));
                }
                if (lp->port == 0) {
                        if (!xdr_u_long(xdrs, portp)) {
-                               note(N_WARNING,
-                                       "%s: [%s] can't decode reply body!",
+                               xlog_warn("%s: [%s] can't decode reply body!",
                                        __func__,
                                        inet_ntoa(sin->sin_addr));
                                lp = NULL;
@@ -260,7 +258,7 @@ process_entry(notify_list *lp)
 /*     __u32                   proc, vers, prog; */
 
        if (NL_TIMES(lp) == 0) {
-               note(N_DEBUG, "%s: Cannot notify %s, giving up.",
+               xlog(D_GENERAL, "%s: Cannot notify %s, giving up",
                                __func__, inet_ntoa(NL_ADDR(lp)));
                return 0;
        }
@@ -286,7 +284,7 @@ process_entry(notify_list *lp)
 
        lp->xid = xmit_call(&sin, prog, vers, proc, func, objp);
        if (!lp->xid) {
-               note(N_WARNING, "%s: failed to notify port %d",
+               xlog_warn("%s: failed to notify port %d",
                                __func__, ntohs(lp->port));
        }
        NL_TIMES(lp) -= 1;
@@ -319,10 +317,10 @@ process_reply(FD_SET_TYPE *rfds)
                        nlist_insert_timer(&notify, lp);
                        return 1;
                }
-               note(N_WARNING, "%s: [%s] service %d not registered",
+               xlog_warn("%s: [%s] service %d not registered",
                        __func__, inet_ntoa(lp->addr), NL_MY_PROG(lp));
        } else {
-               dprintf(N_DEBUG, "%s: Callback to %s (for %d) succeeded.",
+               xlog(D_GENERAL, "%s: Callback to %s (for %d) succeeded",
                        __func__, NL_MY_NAME(lp), NL_MON_NAME(lp));
        }
        nlist_free(&notify, lp);
@@ -346,8 +344,8 @@ process_notify_list(void)
                        nlist_remove(&notify, entry);
                        nlist_insert_timer(&notify, entry);
                } else {
-                       note(N_ERROR,
-                               "%s: Can't callback %s (%d,%d), giving up.",
+                       xlog(L_ERROR,
+                               "%s: Can't callback %s (%d,%d), giving up",
                                        __func__,
                                        NL_MY_NAME(entry),
                                        NL_MY_PROG(entry),