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

Fix a boatload of warnings in the examples.

Browse Source 
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Thu Oct 20 02:29:52 CEST 2011 on sn-devel-104
This commit is contained in:
Jeremy Allison 2011-10-19 14:52:41 -07:00
parent f64f91f96f
commit 019f643c69
15 changed files with 48 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/libsmbclient/testacl.c
View File

@ -27,10 +27,10 @@ int main(int argc, const char *argv[])
int stat_and_retry = 0;
int full_time_names = 0;
enum acl_mode mode = SMB_ACL_LIST;
static char *the_acl = NULL;
static const char *the_acl = NULL;
int ret;
char *p;
char *debugstr;
const char *debugstr;
char path[1024];
char value[1024];
poptContext pc;

8
examples/libsmbclient/testacl2.c
View File

@ -19,17 +19,11 @@ enum acl_mode
int main(int argc, const char *argv[])
{
int i;
int opt;
int flags;
int debug = 0;
int numeric = 0;
int full_time_names = 0;
enum acl_mode mode = SMB_ACL_GET;
static char *the_acl = NULL;
int ret;
char *p;
char *debugstr;
const char *debugstr;
char value[1024];
if (smbc_init(get_auth_data_fn, debug) != 0)

7
examples/libsmbclient/testacl3.c
View File

@ -10,19 +10,12 @@
int main(int argc, char * argv[])
{
int i;
int fd;
int ret;
int debug = 0;
int mode = 0666;
int savedErrno;
char value[2048];
char path[2048];
char * the_acl;
char * p;
time_t t0;
time_t t1;
struct stat st;
SMBCCTX * context;
smbc_init(get_auth_data_fn, debug);

35
examples/libsmbclient/testbrowse.c
View File

@ -9,16 +9,6 @@
#include <libsmbclient.h>
#include "get_auth_data_fn.h"
static void
no_auth_data_fn(const char * pServer,
const char * pShare,
char * pWorkgroup,
int maxLenWorkgroup,
char * pUsername,
int maxLenUsername,
char * pPassword,
int maxLenPassword);
static void browse(char * path,
int scan,
int indent);
@ -44,10 +34,8 @@ main(int argc, char * argv[])
int context_auth = 0;
int scan = 0;
int iterations = -1;
int again;
int opt;
char * p;
char * q;
char buf[1024];
poptContext pc;
SMBCCTX * context;
@ -112,7 +100,7 @@ main(int argc, char * argv[])
if (context_auth) {
smbc_setFunctionAuthDataWithContext(context,
get_auth_data_with_context_fn);
smbc_setOptionUserData(context, "hello world");
smbc_setOptionUserData(context, (void *)"hello world");
} else {
smbc_setFunctionAuthData(context, get_auth_data_fn);
}
@ -171,21 +159,6 @@ main(int argc, char * argv[])
exit(0);
}
static void
no_auth_data_fn(const char * pServer,
const char * pShare,
char * pWorkgroup,
int maxLenWorkgroup,
char * pUsername,
int maxLenUsername,
char * pPassword,
int maxLenPassword)
{
return;
}
static void
get_auth_data_with_context_fn(SMBCCTX * context,
const char * pServer,
@ -213,7 +186,7 @@ static void browse(char * path, int scan, int indent)
char * p;
char buf[1024];
int dir;
struct stat stat;
struct stat st;
struct smbc_dirent * dirent;
if (! scan)
@ -268,14 +241,14 @@ static void browse(char * path, int scan, int indent)
p = path + strlen(path);
strcat(p, "/");
strcat(p+1, dirent->name);
if (smbc_stat(path, &stat) < 0)
if (smbc_stat(path, &st) < 0)
{
printf(" unknown size (reason %d: %s)",
errno, strerror(errno));
}
else
{
printf(" size %lu", (unsigned long) stat.st_size);
printf(" size %lu", (unsigned long) st.st_size);
}
*p = '\0';

66
examples/libsmbclient/testbrowse2.c
View File

@ -10,9 +10,9 @@
#include <libsmbclient.h>
int debuglevel = 0;
char *workgroup = "NT";
char *username = "guest";
char *password = "";
const char *workgroup = "NT";
const char *username = "guest";
const char *password = "";
typedef struct smbitem smbitem;
typedef int(*qsort_cmp)(const void *, const void *);
@ -23,55 +23,7 @@ struct smbitem{
char name[1];
};
int smbitem_cmp(smbitem *elem1, smbitem *elem2){
return strcmp(elem1->name, elem2->name);
}
int smbitem_list_count(smbitem *list){
int count = 0;
while(list != NULL){
list = list->next;
count++;
}
return count;
}
void smbitem_list_delete(smbitem *list){
smbitem *elem;
while(list != NULL){
elem = list;
list = list->next;
free(elem);
}
}
smbitem* smbitem_list_sort(smbitem *list){
smbitem *item, **array;
int count, i;
if ((count = smbitem_list_count(list)) == 0) return NULL;
if ((array = malloc(count * sizeof(smbitem*))) == NULL){
smbitem_list_delete(list);
return NULL;
}
for(i = 0; i < count; i++){
array[i] = list;
list = list->next;
}
qsort(array, count, sizeof(smbitem*), (qsort_cmp)smbitem_cmp);
for(i = 0; i < count - 1; i++) array[i]->next = array[i + 1];
array[count - 1]->next = NULL;
list = array[0];
free(array);
return list;
}
void smbc_auth_fn(
static void smbc_auth_fn(
const char *server,
const char *share,
char *wrkgrp, int wrkgrplen,
@ -88,7 +40,7 @@ void smbc_auth_fn(
strncpy(passwd, password, passwdlen - 1); passwd[passwdlen - 1] = 0;
}
SMBCCTX* create_smbctx(){
static SMBCCTX* create_smbctx(void){
SMBCCTX *ctx;
if ((ctx = smbc_new_context()) == NULL) return NULL;
@ -104,12 +56,12 @@ SMBCCTX* create_smbctx(){
return ctx;
}
void delete_smbctx(SMBCCTX* ctx){
static void delete_smbctx(SMBCCTX* ctx){
smbc_getFunctionPurgeCachedServers(ctx)(ctx);
smbc_free_context(ctx, 1);
}
smbitem* get_smbitem_list(SMBCCTX *ctx, char *smb_path){
static smbitem* get_smbitem_list(SMBCCTX *ctx, char *smb_path){
SMBCFILE *fd;
struct smbc_dirent *dirent;
smbitem *list = NULL, *item;
@ -134,7 +86,7 @@ smbitem* get_smbitem_list(SMBCCTX *ctx, char *smb_path){
}
void print_smb_path(char *group, char *path){
static void print_smb_path(const char *group, const char *path){
if ((strlen(group) == 0) && (strlen(path) == 0)) printf("/\n");
else if (strlen(path) == 0) printf("/%s\n", group);
else{
@ -143,7 +95,7 @@ void print_smb_path(char *group, char *path){
}
}
void recurse(SMBCCTX *ctx, char *smb_group, char *smb_path, int maxlen){
static void recurse(SMBCCTX *ctx, const char *smb_group, char *smb_path, int maxlen){
int len;
smbitem *list, *item;
SMBCCTX *ctx1;

4
examples/libsmbclient/testchmod.c
View File

@ -8,11 +8,9 @@
int main(int argc, char * argv[])
{
int ret;
int debug = 0;
int mode = 0666;
char buffer[16384];
char * pSmbPath = NULL;
const char * pSmbPath = NULL;
struct stat st;
if (argc == 1)

1
examples/libsmbclient/testfstatvfs.c
View File

@ -11,7 +11,6 @@
int main(int argc, char * argv[])
{
int i;
int fd;
int ret;
int debug = 0;

5
examples/libsmbclient/testread.c
View File

@ -10,18 +10,13 @@
int main(int argc, char * argv[])
{
int i;
int fd;
int ret;
int debug = 0;
int mode = 0666;
int savedErrno;
char buffer[2048];
char path[2048];
char * p;
time_t t0;
time_t t1;
struct stat st;
smbc_init(get_auth_data_fn, debug);

23
examples/libsmbclient/teststat.c
View File

@ -9,12 +9,11 @@
int main(int argc, char * argv[])
{
int debug = 0;
char buffer[16384];
char mtime[32];
char ctime[32];
char atime[32];
char * pSmbPath = NULL;
char * pLocalPath = NULL;
char m_time[32];
char c_time[32];
char a_time[32];
const char * pSmbPath = NULL;
const char * pLocalPath = NULL;
struct stat st;
if (argc == 1)
@ -49,9 +48,9 @@ int main(int argc, char * argv[])
}
printf("\nSAMBA\n mtime:%lu/%s ctime:%lu/%s atime:%lu/%s\n",
st.st_mtime, ctime_r(&st.st_mtime, mtime),
st.st_ctime, ctime_r(&st.st_ctime, ctime),
st.st_atime, ctime_r(&st.st_atime, atime));
st.st_mtime, ctime_r(&st.st_mtime, m_time),
st.st_ctime, ctime_r(&st.st_ctime, c_time),
st.st_atime, ctime_r(&st.st_atime, a_time));
if (pLocalPath != NULL)
{
@ -62,9 +61,9 @@ int main(int argc, char * argv[])
}
printf("LOCAL\n mtime:%lu/%s ctime:%lu/%s atime:%lu/%s\n",
st.st_mtime, ctime_r(&st.st_mtime, mtime),
st.st_ctime, ctime_r(&st.st_ctime, ctime),
st.st_atime, ctime_r(&st.st_atime, atime));
st.st_mtime, ctime_r(&st.st_mtime, m_time),
st.st_ctime, ctime_r(&st.st_ctime, c_time),
st.st_atime, ctime_r(&st.st_atime, a_time));
}
return 0;

22
examples/libsmbclient/teststat2.c
View File

@ -34,11 +34,10 @@ int main(int argc, char* argv[])
static int gettime(const char * pUrl,
const char * pLocalPath)
{
//char *pSmbPath = 0;
struct stat st;
char mtime[32];
char ctime[32];
char atime[32];
char m_time[32];
char c_time[32];
char a_time[32];
smbc_init(get_auth_data_fn, 0);
@ -49,12 +48,12 @@ static int gettime(const char * pUrl,
}
printf("SAMBA\n mtime:%lu/%s ctime:%lu/%s atime:%lu/%s\n",
st.st_mtime, ctime_r(&st.st_mtime, mtime),
st.st_ctime, ctime_r(&st.st_ctime, ctime),
st.st_atime, ctime_r(&st.st_atime, atime));
st.st_mtime, ctime_r(&st.st_mtime, m_time),
st.st_ctime, ctime_r(&st.st_ctime, c_time),
st.st_atime, ctime_r(&st.st_atime, a_time));
// check the stat on this file
/* check the stat on this file */
if (stat(pLocalPath, &st) < 0)
{
perror("stat");
@ -62,11 +61,10 @@ static int gettime(const char * pUrl,
}
printf("LOCAL\n mtime:%lu/%s ctime:%lu/%s atime:%lu/%s\n",
st.st_mtime, ctime_r(&st.st_mtime, mtime),
st.st_ctime, ctime_r(&st.st_ctime, ctime),
st.st_atime, ctime_r(&st.st_atime, atime));
st.st_mtime, ctime_r(&st.st_mtime, m_time),
st.st_ctime, ctime_r(&st.st_ctime, c_time),
st.st_atime, ctime_r(&st.st_atime, a_time));
return 0;
}

3
examples/libsmbclient/teststat3.c
View File

@ -17,9 +17,6 @@ int main(int argc, char* argv[])
int fd;
struct stat st1;
struct stat st2;
char mtime[32];
char ctime[32];
char atime[32];
char * pUrl = argv[1];
if(argc != 2)

3
examples/libsmbclient/teststatvfs.c
View File

@ -11,13 +11,10 @@
int main(int argc, char * argv[])
{
int i;
int fd;
int ret;
int debug = 0;
char * p;
char path[2048];
struct stat statbuf;
struct statvfs statvfsbuf;
smbc_init(get_auth_data_fn, debug);

2
examples/libsmbclient/testtruncate.c
View File

@ -14,8 +14,6 @@ int main(int argc, char * argv[])
int debug = 0;
int savedErrno;
char buffer[128];
char * pSmbPath = NULL;
char * pLocalPath = NULL;
struct stat st;
if (argc != 2)

23
examples/libsmbclient/testutime.c
View File

@ -9,15 +9,12 @@
int main(int argc, char * argv[])
{
int ret;
int debug = 0;
char buffer[16384];
char mtime[32];
char ctime[32];
char atime[32];
char * pSmbPath = NULL;
char m_time[32];
char c_time[32];
char a_time[32];
const char * pSmbPath = NULL;
time_t t = time(NULL);
struct tm tm;
struct stat st;
struct utimbuf utimbuf;
@ -51,9 +48,9 @@ int main(int argc, char * argv[])
}
printf("Before\n mtime:%lu/%s ctime:%lu/%s atime:%lu/%s\n",
st.st_mtime, ctime_r(&st.st_mtime, mtime),
st.st_ctime, ctime_r(&st.st_ctime, ctime),
st.st_atime, ctime_r(&st.st_atime, atime));
st.st_mtime, ctime_r(&st.st_mtime, m_time),
st.st_ctime, ctime_r(&st.st_ctime, c_time),
st.st_atime, ctime_r(&st.st_atime, a_time));
utimbuf.actime = t; /* unchangable (wont change) */
utimbuf.modtime = t; /* this one should succeed */
@ -70,9 +67,9 @@ int main(int argc, char * argv[])
}
printf("After\n mtime:%lu/%s ctime:%lu/%s atime:%lu/%s\n",
st.st_mtime, ctime_r(&st.st_mtime, mtime),
st.st_ctime, ctime_r(&st.st_ctime, ctime),
st.st_atime, ctime_r(&st.st_atime, atime));
st.st_mtime, ctime_r(&st.st_mtime, m_time),
st.st_ctime, ctime_r(&st.st_ctime, c_time),
st.st_atime, ctime_r(&st.st_atime, a_time));
return 0;
}

5
examples/libsmbclient/testwrite.c
View File

@ -10,18 +10,13 @@
int main(int argc, char * argv[])
{
int i;
int fd;
int ret;
int debug = 0;
int mode = 0666;
int savedErrno;
char buffer[2048];
char path[2048];
char * p;
time_t t0;
time_t t1;
struct stat st;
smbc_init(get_auth_data_fn, debug);