Warnings purge

[people/xl0/gpxe.git] / src / proto / nfs.c

diff --git a/src/proto/nfs.c b/src/proto/nfs.c
index 2d83789..2743287 100644 (file)
--- a/src/proto/nfs.c
+++ b/src/proto/nfs.c
@@ -1,7 +1,7 @@
 #include "etherboot.h"
-#include "init.h"
+#include <gpxe/init.h>
 #include "proto.h"
-#include "in.h"
+#include <gpxe/in.h>
 #include "nic.h"
 
 /* NOTE: the NFS code is heavily inspired by the NetBSD netboot code (read:
@@ -49,7 +49,7 @@ static void rpc_printerror(struct rpc_t *rpc)
            rpc->u.reply.astatus) {
                /* rpc_printerror() is called for any RPC related error,
                 * suppress output if no low level RPC error happened.  */
-               DBG("RPC error: (%d,%d,%d)\n", ntohl(rpc->u.reply.rstatus),
+               DBG("RPC error: (%ld,%ld,%ld)\n", ntohl(rpc->u.reply.rstatus),
                    ntohl(rpc->u.reply.verifier),
                    ntohl(rpc->u.reply.astatus));
        }
@@ -503,14 +503,14 @@ static int nfs ( char *url __unused, struct sockaddr_in *server,
        mount_server.sin_addr = nfs_server.sin_addr = server->sin_addr;
        mount_server.sin_port = rpc_lookup(server, PROG_MOUNT, 1, sport);
        if ( ! mount_server.sin_port ) {
-               DBG ( "Cannot get mount port from %!:%d\n",
-                     server->sin_addr.s_addr, server->sin_port );
+               DBG ( "Cannot get mount port from %s:%d\n",
+                     inet_ntoa ( server->sin_addr ), server->sin_port );
                return 0;
        }
        nfs_server.sin_port = rpc_lookup(server, PROG_NFS, 2, sport);
        if ( ! mount_server.sin_port ) {
-               DBG ( "Cannot get nfs port from %!:%d\n",
-                     server->sin_addr.s_addr, server->sin_port );
+               DBG ( "Cannot get nfs port from %s:%d\n",
+                     inet_ntoa ( server->sin_addr ), server->sin_port );
                return 0;
        }
 
@@ -575,7 +575,7 @@ nfssymlink:
                        return 0;
                }
                if (err) {
-                       printf("reading at offset %d: ", offs);
+                       printf("\nError reading at offset %d: ", offs);
                        nfs_printerror(err);
                        nfs_reset();
                        return 0;
@@ -610,7 +610,7 @@ nfssymlink:
 
 INIT_FN ( INIT_RPC, rpc_init, nfs_reset, nfs_reset );
 
-static struct protocol nfs_protocol __protocol = {
+struct protocol nfs_protocol __protocol = {
        .name = "nfs",
        .default_port = SUNRPC_PORT,
        .load = nfs,