svn commit: samba r9860 - in branches/SOC/SAMBA_3_0/source/client: .
kalim at samba.org
kalim at samba.org
Thu Sep 1 01:43:31 GMT 2005
Author: kalim
Date: 2005-09-01 01:43:30 +0000 (Thu, 01 Sep 2005)
New Revision: 9860
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9860
Log:
More formatting fixes. Browse output looks ok now.
-Kalim
Modified:
branches/SOC/SAMBA_3_0/source/client/client.c
Changeset:
Modified: branches/SOC/SAMBA_3_0/source/client/client.c
===================================================================
--- branches/SOC/SAMBA_3_0/source/client/client.c 2005-09-01 01:32:50 UTC (rev 9859)
+++ branches/SOC/SAMBA_3_0/source/client/client.c 2005-09-01 01:43:30 UTC (rev 9860)
@@ -1,11 +1,11 @@
/*
Unix SMB/CIFS implementation.
SMB client
- Copyright (C) Andrew Tridgell 1994-1998
- Copyright (C) Simo Sorce 2001-2002
- Copyright (C) Jelmer Vernooij 2003
- Copyright (C) Gerald (Jerry) Carter 2004
- Copyright (C) Kalim Moghul 2005
+ Copyright (C) Andrew Tridgell 1994-1998
+ Copyright (C) Simo Sorce 2001-2002
+ Copyright (C) Jelmer Vernooij 2003
+ Copyright (C) Gerald (Jerry) Carter 2004
+ Copyright (C) Kalim Moghul 2005
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -107,15 +107,10 @@
****************************************************************************/
static void
-get_auth_data_fn(const char * pServer,
- const char * pShare,
- char * pWorkgroup,
- int maxLenWorkgroup,
- char * pUsername,
- int maxLenUsername,
- char * pPassword,
- int maxLenPassword)
-
+get_auth_data_fn(const char * pServer, const char * pShare,
+ char * pWorkgroup, int maxLenWorkgroup,
+ char * pUsername, int maxLenUsername,
+ char * pPassword, int maxLenPassword)
{
char temp[sizeof(fstring)];
@@ -443,7 +438,7 @@
{
if (do_this_one(finfo)) {
time_t t = finfo->mtime; /* the time is assumed to be passed as GMT */
- d_printf(" %-30s%7.7s %8.0f %s",
+ d_printf(" %-30s%7.7s %8.0f %s",
finfo->name,
attrib_string(finfo->mode),
(double)finfo->size,
@@ -463,7 +458,7 @@
pstrcpy(time_str, asctime(LocalTime(&t)));
time_str[strlen(time_str)-1] = 0;
d_printf("> %-30s", name);
- d_printf("%10.10s %8.0f %s\n", *mode_t_string(st->st_mode), (double)st->st_size, time_str);
+ d_printf("%10.10s %8.0f %s\n", *mode_t_string(st->st_mode), (double)st->st_size, time_str);
}
/****************************************************************************
@@ -2707,29 +2702,29 @@
****************************************************************************/
static void browse_fn(const char *name, uint32 m,
- const char *comment, void *state)
+ const char *comment, void *state)
{
- fstring typestr;
+ fstring typestr;
- *typestr=0;
+ *typestr=0;
- switch (m)
- {
- case STYPE_DISKTREE:
- fstrcpy(typestr,"Disk"); break;
- case STYPE_PRINTQ:
- fstrcpy(typestr,"Printer"); break;
- case STYPE_DEVICE:
- fstrcpy(typestr,"Device"); break;
- case STYPE_IPC:
- fstrcpy(typestr,"IPC"); break;
- }
+ switch (m)
+ {
+ case STYPE_DISKTREE:
+ fstrcpy(typestr,"Disk"); break;
+ case STYPE_PRINTQ:
+ fstrcpy(typestr,"Printer"); break;
+ case STYPE_DEVICE:
+ fstrcpy(typestr,"Device"); break;
+ case STYPE_IPC:
+ fstrcpy(typestr,"IPC"); break;
+ }
/* FIXME: If the remote machine returns non-ascii characters
- in any of these fields, they can corrupt the output. We
+ in any of these fields, they can corrupt the output. We
should remove them. */
if (!grepable) {
d_printf("\t%-15s %-10.10s%s\n",
- name,typestr,comment);
+ name,typestr,comment);
} else {
d_printf ("%s|%s|%s\n",typestr,name,comment);
}
@@ -2743,8 +2738,8 @@
{
int ret;
if (!grepable) {
- d_printf("\n\tSharename Type Comment\n");
- d_printf("\t--------- ---- -------\n");
+ d_printf("\n\tSharename Type Comment\n");
+ d_printf("\t--------- ---- -------\n");
}
if((ret = cli_RNetShareEnum(cli, browse_fn, NULL)) == -1)
@@ -2758,11 +2753,11 @@
****************************************************************************/
static void server_fn(const char *name, uint32 m,
- const char *comment, void *state)
+ const char *comment, void *state)
{
if (!grepable){
- d_printf("\t%-16s %s\n", name, comment);
+ d_printf("\t%-16s %s\n", name, comment);
} else {
d_printf("%s|%s|%s\n",(char *)state, name, comment);
}
@@ -2780,16 +2775,16 @@
return False;
if (!grepable) {
- d_printf("\n\tServer Comment\n");
- d_printf("\t--------- -------\n");
+ d_printf("\n\tServer Comment\n");
+ d_printf("\t--------- -------\n");
};
fstrcpy( state, "Server" );
cli_NetServerEnum(cli, cli->server_domain, SV_TYPE_ALL, server_fn,
state);
if (!grepable) {
- d_printf("\n\tWorkgroup Master\n");
- d_printf("\t--------- -------\n");
+ d_printf("\n\tWorkgroup Master\n");
+ d_printf("\t--------- -------\n");
};
fstrcpy( state, "Workgroup" );
More information about the samba-cvs
mailing list