sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

s3-vfstest: Fix some nonblank line endings

Browse Source
This commit is contained in:
Volker Lendecke 2012-02-01 14:42:39 +01:00
parent 6ba09e039e
commit 435f817329
2 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source3/torture/cmd_vfs.c
View File

@ -1,4 +1,4 @@
/*
/*
Unix SMB/CIFS implementation.
VFS module functions
@ -9,12 +9,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@ -31,7 +31,7 @@ static const char *null_string = "";
static NTSTATUS cmd_load_module(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, const char **argv)
{
int i;
if (argc < 2) {
printf("Usage: load <modules>\n");
return NT_STATUS_OK;
@ -207,7 +207,7 @@ static NTSTATUS cmd_mkdir(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc,
printf("mkdir error=%d (%s)\n", errno, strerror(errno));
return NT_STATUS_UNSUCCESSFUL;
}
printf("mkdir: ok\n");
return NT_STATUS_OK;
}
@ -216,7 +216,7 @@ static NTSTATUS cmd_mkdir(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc,
static NTSTATUS cmd_closedir(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, const char **argv)
{
int ret;
if (vfs->currentdir == NULL) {
printf("closedir: failure (no directory open)\n");
return NT_STATUS_UNSUCCESSFUL;
@ -441,7 +441,7 @@ static NTSTATUS cmd_read(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, c
return NT_STATUS_UNSUCCESSFUL;
}
vfs->data_size = size;
rsize = SMB_VFS_READ(vfs->files[fd], vfs->data, size);
if (rsize == -1) {
printf("read: error=%d (%s)\n", errno, strerror(errno));
@ -781,7 +781,7 @@ static NTSTATUS cmd_lstat(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc,
printf(" Modify: %s", ctime(&tmp_time));
tmp_time = convert_timespec_to_time_t(st.st_ex_ctime);
printf(" Change: %s", ctime(&tmp_time));
return NT_STATUS_OK;
}
@ -970,7 +970,7 @@ static NTSTATUS cmd_lock(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, c
long count;
int type;
const char *typestr;
if (argc != 6) {
printf("Usage: lock <fd> <op> <offset> <count> <type>\n");
printf(" ops: G = F_GETLK\n");
@ -1103,7 +1103,7 @@ static NTSTATUS cmd_mknod(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc,
mode_t mode;
unsigned int dev_val;
SMB_DEV_T dev;
if (argc != 4) {
printf("Usage: mknod <path> <mode> <dev>\n");
printf(" mode is octal\n");

29
source3/torture/vfstest.c
View File

@ -1,4 +1,4 @@
/*
/*
Unix SMB/CIFS implementation.
VFS module tester
@ -13,12 +13,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@ -45,11 +45,11 @@ static char **completion_fn(const char *text, int start, int end)
int i, count=0;
struct cmd_list *commands = cmd_list;
if (start)
if (start)
return NULL;
/* make sure we have a list of valid commands */
if (!commands)
if (!commands)
return NULL;
matches = SMB_MALLOC_ARRAY(char *, MAX_COMPLETIONS);
@ -58,25 +58,24 @@ static char **completion_fn(const char *text, int start, int end)
matches[count++] = SMB_STRDUP(text);
if (!matches[0]) return NULL;
while (commands && count < MAX_COMPLETIONS-1)
while (commands && count < MAX_COMPLETIONS-1)
{
if (!commands->cmd_set)
break;
for (i=0; commands->cmd_set[i].name; i++)
{
if ((strncmp(text, commands->cmd_set[i].name, strlen(text)) == 0) &&
commands->cmd_set[i].fn)
commands->cmd_set[i].fn)
{
matches[count] = SMB_STRDUP(commands->cmd_set[i].name);
if (!matches[count])
if (!matches[count])
return NULL;
count++;
}
}
commands = commands->next;
}
if (count == 2) {
@ -121,7 +120,7 @@ static NTSTATUS cmd_conf(struct vfs_state *vfs, TALLOC_CTX *mem_ctx,
printf("\"%s\" successfully loaded\n", argv[1]);
return NT_STATUS_OK;
}
/* Display help on commands */
static NTSTATUS cmd_help(struct vfs_state *vfs, TALLOC_CTX *mem_ctx,
int argc, const char **argv)
@ -139,7 +138,7 @@ static NTSTATUS cmd_help(struct vfs_state *vfs, TALLOC_CTX *mem_ctx,
if (argc == 2) {
for (tmp = cmd_list; tmp; tmp = tmp->next) {
tmp_set = tmp->cmd_set;
while(tmp_set->name) {
@ -442,7 +441,7 @@ int main(int argc, char *argv[])
pc = poptGetContext("vfstest", argc, (const char **) argv,
long_options, 0);
while(poptGetNextOpt(pc) != -1);
@ -456,7 +455,7 @@ int main(int argc, char *argv[])
/* the following functions are part of the Samba debugging
facilities. See lib/debug.c */
setup_logging("vfstest", DEBUG_STDOUT);
/* Load command lists */
cmd_set = vfstest_command_list;