From 903a3ecae85e0dcddf018805c883d10a5713ae52 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Mon, 15 Nov 2010 13:17:55 +1030 Subject: [PATCH 1/1] nfs: remove trailing whitespace ccanlint complained about it; it's trivial but fixing it adds one point to our score. --- ccan/nfs/dlinklist.h | 2 +- ccan/nfs/init.c | 2 +- ccan/nfs/libnfs-private.h | 2 +- ccan/nfs/libnfs-raw.h | 10 +++++----- ccan/nfs/libnfs-sync.c | 2 +- ccan/nfs/libnfs.c | 4 ++-- ccan/nfs/mount.c | 2 +- ccan/nfs/nfs.c | 20 ++++++++++---------- ccan/nfs/nfs.h | 2 +- ccan/nfs/nfsacl.c | 2 +- ccan/nfs/pdu.c | 2 +- ccan/nfs/portmap.c | 2 +- ccan/nfs/socket.c | 8 ++++---- 13 files changed, 30 insertions(+), 30 deletions(-) diff --git a/ccan/nfs/dlinklist.h b/ccan/nfs/dlinklist.h index 6d525f90..acbb9863 100644 --- a/ccan/nfs/dlinklist.h +++ b/ccan/nfs/dlinklist.h @@ -1,4 +1,4 @@ -/* +/* Unix SMB/CIFS implementation. some simple double linked list macros diff --git a/ccan/nfs/init.c b/ccan/nfs/init.c index 9bc3c7e8..888504fb 100644 --- a/ccan/nfs/init.c +++ b/ccan/nfs/init.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) by Ronnie Sahlberg 2010 This program is free software; you can redistribute it and/or modify diff --git a/ccan/nfs/libnfs-private.h b/ccan/nfs/libnfs-private.h index 7aeede84..5946ae4c 100644 --- a/ccan/nfs/libnfs-private.h +++ b/ccan/nfs/libnfs-private.h @@ -1,6 +1,6 @@ #ifndef CCAN_NFS_LIBNFS_PRIVATE_H #define CCAN_NFS_LIBNFS_PRIVATE_H -/* +/* Copyright (C) by Ronnie Sahlberg 2010 This program is free software; you can redistribute it and/or modify diff --git a/ccan/nfs/libnfs-raw.h b/ccan/nfs/libnfs-raw.h index 076b1380..e61d17ec 100644 --- a/ccan/nfs/libnfs-raw.h +++ b/ccan/nfs/libnfs-raw.h @@ -1,6 +1,6 @@ #ifndef CCAN_NFS_LIBNFS_RAW_H #define CCAN_NFS_LIBNFS_RAW_H -/* +/* Copyright (C) by Ronnie Sahlberg 2010 This program is free software; you can redistribute it and/or modify @@ -71,7 +71,7 @@ int rpc_disconnect(struct rpc_context *rpc, char *error); void rpc_set_error(struct rpc_context *rpc, char *error_string, ...); -/* +/* * PORTMAP FUNCTIONS */ @@ -110,7 +110,7 @@ int rpc_pmap_getport_async(struct rpc_context *rpc, int program, int version, rp -/* +/* * MOUNT FUNCTIONS */ char *mountstat3_to_str(int stat); @@ -215,7 +215,7 @@ int rpc_mount_export_async(struct rpc_context *rpc, rpc_cb cb, void *private_dat -/* +/* * NFS FUNCTIONS */ struct nfs_fh3; @@ -540,7 +540,7 @@ int rpc_nfs_link_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *file, -/* +/* * NFSACL FUNCTIONS */ /* diff --git a/ccan/nfs/libnfs-sync.c b/ccan/nfs/libnfs-sync.c index 79a44f48..493209ca 100644 --- a/ccan/nfs/libnfs-sync.c +++ b/ccan/nfs/libnfs-sync.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) by Ronnie Sahlberg 2010 This program is free software; you can redistribute it and/or modify diff --git a/ccan/nfs/libnfs.c b/ccan/nfs/libnfs.c index 8d4da9f5..c86bbab7 100644 --- a/ccan/nfs/libnfs.c +++ b/ccan/nfs/libnfs.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) by Ronnie Sahlberg 2010 This program is free software; you can redistribute it and/or modify @@ -365,7 +365,7 @@ static void nfs_mount_3_cb(struct rpc_context *rpc, int status, void *command_da struct nfs_context *nfs = data->nfs; uint32_t mount_port; - if (status == RPC_STATUS_ERROR) { + if (status == RPC_STATUS_ERROR) { data->cb(-EFAULT, nfs, command_data, data->private_data); free_nfs_cb_data(data); return; diff --git a/ccan/nfs/mount.c b/ccan/nfs/mount.c index 7c7ac7ec..b79b7f70 100644 --- a/ccan/nfs/mount.c +++ b/ccan/nfs/mount.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) by Ronnie Sahlberg 2010 This program is free software; you can redistribute it and/or modify diff --git a/ccan/nfs/nfs.c b/ccan/nfs/nfs.c index 736095c5..684ce350 100644 --- a/ccan/nfs/nfs.c +++ b/ccan/nfs/nfs.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) by Ronnie Sahlberg 2010 This program is free software; you can redistribute it and/or modify @@ -129,8 +129,8 @@ int rpc_nfs_getattr_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh return -1; } - args.object.data.data_len = fh->data.data_len; - args.object.data.data_val = fh->data.data_val; + args.object.data.data_len = fh->data.data_len; + args.object.data.data_val = fh->data.data_val; if (xdr_GETATTR3args(&pdu->xdr, &args) == 0) { rpc_set_error(rpc, "XDR error: Failed to encode GETATTR3args"); @@ -158,8 +158,8 @@ int rpc_nfs_lookup_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh, return -1; } - args.what.dir.data.data_len = fh->data.data_len; - args.what.dir.data.data_val = fh->data.data_val; + args.what.dir.data.data_len = fh->data.data_len; + args.what.dir.data.data_val = fh->data.data_val; args.what.name = name; if (xdr_LOOKUP3args(&pdu->xdr, &args) == 0) { @@ -490,7 +490,7 @@ int rpc_nfs_readdir_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh args.dir.data.data_len = fh->data.data_len; args.dir.data.data_val = fh->data.data_val; args.cookie = cookie; - memcpy(&args.cookieverf, cookieverf, sizeof(cookieverf3)); + memcpy(&args.cookieverf, cookieverf, sizeof(cookieverf3)); args.count = count; if (xdr_READDIR3args(&pdu->xdr, &args) == 0) { @@ -519,8 +519,8 @@ int rpc_nfs_fsstat_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh, return -1; } - args.fsroot.data.data_len = fh->data.data_len; - args.fsroot.data.data_val = fh->data.data_val; + args.fsroot.data.data_len = fh->data.data_len; + args.fsroot.data.data_val = fh->data.data_val; if (xdr_FSSTAT3args(&pdu->xdr, &args) == 0) { rpc_set_error(rpc, "XDR error: Failed to encode FSSTAT3args"); @@ -549,8 +549,8 @@ int rpc_nfs_readlink_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *f return -1; } - args.symlink.data.data_len = fh->data.data_len; - args.symlink.data.data_val = fh->data.data_val; + args.symlink.data.data_len = fh->data.data_len; + args.symlink.data.data_val = fh->data.data_val; if (xdr_READLINK3args(&pdu->xdr, &args) == 0) { rpc_set_error(rpc, "XDR error: Failed to encode READLINK3args"); diff --git a/ccan/nfs/nfs.h b/ccan/nfs/nfs.h index 7d45c13b..b08abbcc 100644 --- a/ccan/nfs/nfs.h +++ b/ccan/nfs/nfs.h @@ -1,6 +1,6 @@ #ifndef CCAN_NFS_H #define CCAN_NFS_H -/* +/* Copyright (C) by Ronnie Sahlberg 2010 This program is free software; you can redistribute it and/or modify diff --git a/ccan/nfs/nfsacl.c b/ccan/nfs/nfsacl.c index 71c72cd4..deaa31a3 100644 --- a/ccan/nfs/nfsacl.c +++ b/ccan/nfs/nfsacl.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) by Ronnie Sahlberg 2010 This program is free software; you can redistribute it and/or modify diff --git a/ccan/nfs/pdu.c b/ccan/nfs/pdu.c index 4b604e0c..e499d58b 100644 --- a/ccan/nfs/pdu.c +++ b/ccan/nfs/pdu.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) by Ronnie Sahlberg 2010 This program is free software; you can redistribute it and/or modify diff --git a/ccan/nfs/portmap.c b/ccan/nfs/portmap.c index 5753736e..09408aa6 100644 --- a/ccan/nfs/portmap.c +++ b/ccan/nfs/portmap.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) by Ronnie Sahlberg 2010 This program is free software; you can redistribute it and/or modify diff --git a/ccan/nfs/socket.c b/ccan/nfs/socket.c index ccdd18df..ea5ed985 100644 --- a/ccan/nfs/socket.c +++ b/ccan/nfs/socket.c @@ -1,4 +1,4 @@ -/* +/* Copyright (C) by Ronnie Sahlberg 2010 This program is free software; you can redistribute it and/or modify @@ -48,7 +48,7 @@ int rpc_which_events(struct rpc_context *rpc) if (rpc->is_connected == 0) { events |= POLLOUT; - } + } if (rpc->outqueue) { events |= POLLOUT; @@ -280,10 +280,10 @@ int rpc_connect_async(struct rpc_context *rpc, const char *server, int port, int rpc_set_error(rpc, "connect() to server failed"); printf("%s\n", rpc->error_string); return -4; - } + } return 0; -} +} int rpc_disconnect(struct rpc_context *rpc, char *error) { -- 2.39.2