Fix some warnings (unused args...). Only bad protos left.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19967 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
François Revol
2007-01-26 13:33:53 +00:00
parent c01f349e6d
commit caa76e0da1
4 changed files with 60 additions and 38 deletions
@@ -81,8 +81,8 @@ RPCPendingCallsFindAndRemovePendingCall (struct RPCPendingCalls *calls,
{ {
if (current->xid==xid) if (current->xid==xid)
{ {
if ((current->addr.sin_addr.s_addr==addr->sin_addr.s_addr)&& if (((current->addr.sin_addr.s_addr==addr->sin_addr.s_addr)&&
(current->addr.sin_port==addr->sin_port) || conf_no_check_ip_xid) (current->addr.sin_port==addr->sin_port)) || conf_no_check_ip_xid)
{ {
if (last) if (last)
last->next=current->next; last->next=current->next;
@@ -140,7 +140,7 @@ SemaphorePoolGet(struct SemaphorePool *pool)
if (pool->fPoolCount==0) if (pool->fPoolCount==0)
{ {
sem_id sem=create_sem (0,"pending_call"); sem=create_sem (0,"pending_call");
while (release_sem(pool->fPoolSem)==B_INTERRUPTED) while (release_sem(pool->fPoolSem)==B_INTERRUPTED)
{ {
@@ -54,16 +54,16 @@ extern struct socket_module_info *gSocket;
#define kclosesocket close #define kclosesocket close
#define kmessage(fmt, ...) dprintf("ksocket: " fmt "\n", ##__VA_ARGS__) #define kmessage(fmt, ...) dprintf("ksocket: " fmt "\n", ##__VA_ARGS__)
extern status_t ksocket_init (); extern status_t ksocket_init (void);
extern status_t ksocket_cleanup (); extern status_t ksocket_cleanup (void);
#define KSOCKET_MODULE_DECL \ #define KSOCKET_MODULE_DECL \
struct socket_module_info *gSocket; \ struct socket_module_info *gSocket; \
status_t ksocket_init () { \ status_t ksocket_init (void) { \
return get_module(B_SOCKET_MODULE_NAME, (module_info **)&gSocket); \ return get_module(B_SOCKET_MODULE_NAME, (module_info **)&gSocket); \
} \ } \
\ \
status_t ksocket_cleanup () { \ status_t ksocket_cleanup (void) { \
return put_module(B_SOCKET_MODULE_NAME); \ return put_module(B_SOCKET_MODULE_NAME); \
} }
@@ -92,16 +92,16 @@ extern bone_socket_info_t *gSocket;
#define kclosesocket close #define kclosesocket close
#define kmessage(fmt, ...) dprintf("ksocket: " fmt "\n", ##__VA_ARGS__) #define kmessage(fmt, ...) dprintf("ksocket: " fmt "\n", ##__VA_ARGS__)
extern status_t ksocket_init (); extern status_t ksocket_init (void);
extern status_t ksocket_cleanup (); extern status_t ksocket_cleanup (void);
#define KSOCKET_MODULE_DECL \ #define KSOCKET_MODULE_DECL \
bone_socket_info_t *gSocket; \ bone_socket_info_t *gSocket; \
status_t ksocket_init () { \ status_t ksocket_init (void) { \
return get_module(BONE_SOCKET_MODULE, (module_info **)&gSocket); \ return get_module(BONE_SOCKET_MODULE, (module_info **)&gSocket); \
} \ } \
\ \
status_t ksocket_cleanup () { \ status_t ksocket_cleanup (void) { \
return put_module(BONE_SOCKET_MODULE); \ return put_module(BONE_SOCKET_MODULE); \
} }
@@ -64,7 +64,6 @@ static status_t read_config(void)
{ {
void *handle; void *handle;
const char *str, *endptr; const char *str, *endptr;
int32 value = 0;
handle = load_driver_settings("nfs"); handle = load_driver_settings("nfs");
if (handle == NULL) if (handle == NULL)
@@ -73,12 +72,12 @@ static status_t read_config(void)
str = get_driver_parameter(handle, "high_port", NULL, NULL); str = get_driver_parameter(handle, "high_port", NULL, NULL);
if (str) { if (str) {
endptr = str + strlen(str); endptr = str + strlen(str);
conf_high_port = (int16)strtoul(str, &endptr, 10); conf_high_port = (int16)strtoul(str, (char **)&endptr, 10);
} }
str = get_driver_parameter(handle, "low_port", NULL, NULL); str = get_driver_parameter(handle, "low_port", NULL, NULL);
if (str) { if (str) {
endptr = str + strlen(str); endptr = str + strlen(str);
conf_low_port = (int16)strtoul(str, &endptr, 10); conf_low_port = (int16)strtoul(str, (char **)&endptr, 10);
} }
conf_allow_dir_open = get_driver_boolean_parameter(handle, "allow_dir_open", conf_allow_dir_open, true); conf_allow_dir_open = get_driver_boolean_parameter(handle, "allow_dir_open", conf_allow_dir_open, true);
@@ -88,7 +87,7 @@ static status_t read_config(void)
str = get_driver_parameter(handle, "call_timeout", NULL, NULL); str = get_driver_parameter(handle, "call_timeout", NULL, NULL);
if (str) { if (str) {
endptr = str + strlen(str); endptr = str + strlen(str);
conf_call_timeout = (bigtime_t)1000 * strtoul(str, &endptr, 10); conf_call_timeout = (bigtime_t)1000 * strtoul(str, (char **)&endptr, 10);
if (conf_call_timeout < 1000) if (conf_call_timeout < 1000)
conf_call_timeout = 1000; conf_call_timeout = 1000;
} }
@@ -96,7 +95,7 @@ static status_t read_config(void)
str = get_driver_parameter(handle, "call_tries", NULL, NULL); str = get_driver_parameter(handle, "call_tries", NULL, NULL);
if (str) { if (str) {
endptr = str + strlen(str); endptr = str + strlen(str);
conf_call_tries = strtoul(str, &endptr, 10); conf_call_tries = strtoul(str, (char **)&endptr, 10);
} }
unload_driver_settings(handle); unload_driver_settings(handle);
@@ -197,8 +196,6 @@ init_postoffice(fs_nspace *ns)
extern void extern void
shutdown_postoffice(fs_nspace *ns) shutdown_postoffice(fs_nspace *ns)
{ {
struct sockaddr addr;
int addrSize;
status_t result; status_t result;
ns->quit=true; ns->quit=true;
@@ -215,7 +212,7 @@ postoffice_func(fs_nspace *ns)
while (!ns->quit) while (!ns->quit)
{ {
struct sockaddr_in from; struct sockaddr_in from;
int fromLen=sizeof(from); socklen_t fromLen=sizeof(from);
ssize_t bytes=krecvfrom (ns->s,buffer,B_UDP_MAX_SIZE,0,(struct sockaddr *)&from,&fromLen); ssize_t bytes=krecvfrom (ns->s,buffer,B_UDP_MAX_SIZE,0,(struct sockaddr *)&from,&fromLen);
@@ -233,7 +230,7 @@ postoffice_func(fs_nspace *ns)
while (release_sem (call->sem)==B_INTERRUPTED); while (release_sem (call->sem)==B_INTERRUPTED);
} else { } else {
dprintf("nfs: postoffice: can't find pending call to remove for xid %d\n", xid); dprintf("nfs: postoffice: can't find pending call to remove for xid %ld\n", xid);
} }
} }
} }
@@ -331,7 +328,7 @@ uint8 *send_rpc_call (fs_nspace *ns, const struct sockaddr_in *addr,
call=RPCPendingCallsFindAndRemovePendingCall(&ns->pendingCalls,xid,addr); call=RPCPendingCallsFindAndRemovePendingCall(&ns->pendingCalls,xid,addr);
kmessage ("nfs: xid %d timed out, removing from queue",xid); kmessage ("nfs: xid %ld timed out, removing from queue",xid);
#if 0 #if 0
if (call==NULL) if (call==NULL)
@@ -375,6 +372,8 @@ bool is_successful_reply (struct XDRInPacket *reply)
int32 xid=XDRInPacketGetInt32(reply); int32 xid=XDRInPacketGetInt32(reply);
rpc_msg_type mtype=(rpc_msg_type)XDRInPacketGetInt32(reply); rpc_msg_type mtype=(rpc_msg_type)XDRInPacketGetInt32(reply);
rpc_reply_stat replyStat=(rpc_reply_stat)XDRInPacketGetInt32(reply); rpc_reply_stat replyStat=(rpc_reply_stat)XDRInPacketGetInt32(reply);
(void)xid;
(void)mtype;
if (replyStat==RPC_MSG_DENIED) if (replyStat==RPC_MSG_DENIED)
{ {
@@ -385,7 +384,7 @@ bool is_successful_reply (struct XDRInPacket *reply)
int32 low=XDRInPacketGetInt32(reply); int32 low=XDRInPacketGetInt32(reply);
int32 high=XDRInPacketGetInt32(reply); int32 high=XDRInPacketGetInt32(reply);
kmessage ("RPC_MISMATCH (%d,%d)",low,high); kmessage ("RPC_MISMATCH (%ld,%ld)",low,high);
} }
else else
{ {
@@ -401,13 +400,15 @@ bool is_successful_reply (struct XDRInPacket *reply)
size_t bodyLength=XDRInPacketGetDynamic(reply,body); size_t bodyLength=XDRInPacketGetDynamic(reply,body);
rpc_accept_stat acceptStat=(rpc_accept_stat)XDRInPacketGetInt32(reply); rpc_accept_stat acceptStat=(rpc_accept_stat)XDRInPacketGetInt32(reply);
(void)flavor;
(void)bodyLength;
if (acceptStat==RPC_PROG_MISMATCH) if (acceptStat==RPC_PROG_MISMATCH)
{ {
int32 low=XDRInPacketGetInt32(reply); int32 low=XDRInPacketGetInt32(reply);
int32 high=XDRInPacketGetInt32(reply); int32 high=XDRInPacketGetInt32(reply);
kmessage ("RPC_PROG_MISMATCH (%d,%d)",low,high); kmessage ("RPC_PROG_MISMATCH (%ld,%ld)",low,high);
} }
else if (acceptStat!=RPC_SUCCESS) else if (acceptStat!=RPC_SUCCESS)
kmessage ("Accepted but failed (%d)",acceptStat); kmessage ("Accepted but failed (%d)",acceptStat);
@@ -662,6 +663,7 @@ nfs_truncate_file(fs_nspace *ns, const nfs_fhandle *fhandle, struct stat *st)
void get_nfs_attr (struct XDRInPacket *reply, struct stat *st) void get_nfs_attr (struct XDRInPacket *reply, struct stat *st)
{ {
nfs_ftype ftype=(nfs_ftype)XDRInPacketGetInt32(reply); nfs_ftype ftype=(nfs_ftype)XDRInPacketGetInt32(reply);
(void) ftype;
st->st_mode=XDRInPacketGetInt32(reply); st->st_mode=XDRInPacketGetInt32(reply);
st->st_dev=0; // just to be sure st->st_dev=0; // just to be sure
@@ -853,6 +855,9 @@ fs_release_vnode(fs_nspace *ns, fs_node *node, char r)
fs_write_vnode(fs_nspace *ns, fs_node *node, char r) fs_write_vnode(fs_nspace *ns, fs_node *node, char r)
#endif #endif
{ {
(void) ns;
(void) node;
(void) r;
return B_OK; return B_OK;
} }
@@ -889,7 +894,6 @@ fs_walk(fs_nspace *ns, fs_node *base, const char *file, char **newpath, vnode_id
fs_node *newNode=(fs_node *)malloc(sizeof(fs_node)); fs_node *newNode=(fs_node *)malloc(sizeof(fs_node));
struct stat st; struct stat st;
status_t result;
if ((result=nfs_lookup(ns,&base->fhandle,file,&newNode->fhandle,&st))<B_OK) if ((result=nfs_lookup(ns,&base->fhandle,file,&newNode->fhandle,&st))<B_OK)
{ {
free(newNode); free(newNode);
@@ -943,7 +947,6 @@ extern int
fs_opendir(fs_nspace *ns, fs_node *node, nfs_cookie **cookie) fs_opendir(fs_nspace *ns, fs_node *node, nfs_cookie **cookie)
{ {
struct stat st; struct stat st;
nfs_fhandle fhandle;
status_t result; status_t result;
if ((result=nfs_getattr(ns,&node->fhandle,&st))<B_OK) if ((result=nfs_getattr(ns,&node->fhandle,&st))<B_OK)
@@ -961,12 +964,17 @@ fs_opendir(fs_nspace *ns, fs_node *node, nfs_cookie **cookie)
extern int extern int
fs_closedir(fs_nspace *ns, fs_node *node, nfs_cookie *cookie) fs_closedir(fs_nspace *ns, fs_node *node, nfs_cookie *cookie)
{ {
(void) ns;
(void) node;
(void) cookie;
return B_OK; return B_OK;
} }
extern int extern int
fs_rewinddir(fs_nspace *ns, fs_node *node, nfs_cookie *cookie) fs_rewinddir(fs_nspace *ns, fs_node *node, nfs_cookie *cookie)
{ {
(void) ns;
(void) node;
memset (cookie->opaque,0,NFS_COOKIESIZE); memset (cookie->opaque,0,NFS_COOKIESIZE);
return B_OK; return B_OK;
@@ -1109,6 +1117,8 @@ fs_readdir(fs_nspace *ns, fs_node *node, nfs_cookie *cookie, long *num, struct d
extern int extern int
fs_free_dircookie(fs_nspace *ns, fs_node *node, nfs_cookie *cookie) fs_free_dircookie(fs_nspace *ns, fs_node *node, nfs_cookie *cookie)
{ {
(void) ns;
(void) node;
free(cookie); free(cookie);
return B_OK; return B_OK;
} }
@@ -1116,8 +1126,6 @@ fs_free_dircookie(fs_nspace *ns, fs_node *node, nfs_cookie *cookie)
extern int extern int
fs_rstat(fs_nspace *ns, fs_node *node, struct stat *st) fs_rstat(fs_nspace *ns, fs_node *node, struct stat *st)
{ {
nfs_fhandle fhandle;
status_t result; status_t result;
//dprintf("nfs: rstat()\n");//XXX:mmu_man:debug //dprintf("nfs: rstat()\n");//XXX:mmu_man:debug
if ((result=nfs_getattr(ns,&node->fhandle,st))<B_OK) if ((result=nfs_getattr(ns,&node->fhandle,st))<B_OK)
@@ -1143,7 +1151,7 @@ fs_nspaceDestroy(struct fs_nspace *nspace)
#ifdef PARAMS_AS_STRING #ifdef PARAMS_AS_STRING
int parse_nfs_params(const char *str, struct mount_nfs_params *params) int parse_nfs_params(const char *str, struct mount_nfs_params *params)
{ {
char *p, *e; const char *p, *e;
long v; long v;
int i; int i;
// sprintf(buf, "nfs:%s:%s,uid=%u,gid=%u,hostname=%s", // sprintf(buf, "nfs:%s:%s,uid=%u,gid=%u,hostname=%s",
@@ -1161,25 +1169,25 @@ dprintf("nfs:ip!\n");
strncpy(params->server, p, e - p); strncpy(params->server, p, e - p);
// hack // hack
params->serverIP = 0; params->serverIP = 0;
v = strtol(p, &p, 10); v = strtol(p, (char **)&p, 10);
dprintf("IP:%ld.", v); dprintf("IP:%ld.", v);
if (!p) if (!p)
return EINVAL; return EINVAL;
params->serverIP |= (v << 24); params->serverIP |= (v << 24);
p++; p++;
v = strtol(p, &p, 10); v = strtol(p, (char **)&p, 10);
dprintf("%ld.", v); dprintf("%ld.", v);
if (!p) if (!p)
return EINVAL; return EINVAL;
params->serverIP |= (v << 16); params->serverIP |= (v << 16);
p++; p++;
v = strtol(p, &p, 10); v = strtol(p, (char **)&p, 10);
dprintf("%ld.", v); dprintf("%ld.", v);
if (!p) if (!p)
return EINVAL; return EINVAL;
params->serverIP |= (v << 8); params->serverIP |= (v << 8);
p++; p++;
v = strtol(p, &p, 10); v = strtol(p, (char **)&p, 10);
dprintf("%ld\n", v); dprintf("%ld\n", v);
if (!p) if (!p)
return EINVAL; return EINVAL;
@@ -1210,17 +1218,17 @@ dprintf("nfs:hn!\n");
dprintf("nfs:uid!\n"); dprintf("nfs:uid!\n");
if (p) { if (p) {
p += 4; p += 4;
v = strtol(p, &p, 10); v = strtol(p, (char **)&p, 10);
params->uid = v; params->uid = v;
} }
dprintf("nfs:gid!\n"); dprintf("nfs:gid!\n");
p = strstr(str, "gid="); p = strstr(str, "gid=");
if (p) { if (p) {
p += 4; p += 4;
v = strtol(p, &p, 10); v = strtol(p, (char **)&p, 10);
params->gid = v; params->gid = v;
} }
dprintf("nfs: ip:%08lx server:'%s' export:'%s' hostname:'%s' uid=%d gid=%d \n", dprintf("nfs: ip:%08x server:'%s' export:'%s' hostname:'%s' uid=%d gid=%d \n",
params->serverIP, params->server, params->_export, params->serverIP, params->server, params->_export,
params->hostname, params->uid, params->gid); params->hostname, params->uid, params->gid);
return B_OK; return B_OK;
@@ -1248,7 +1256,7 @@ fs_mount(nspace_id nsid, const char *devname, ulong flags, const char *_parms, s
if (_parms==NULL) if (_parms==NULL)
return EINVAL; return EINVAL;
dprintf("nfs: mount(%d, %s, %08lx)\n", nsid, devname, flags); dprintf("nfs: mount(%ld, %s, %08lx)\n", nsid, devname, flags);
#ifndef PARAMS_AS_STRING #ifndef PARAMS_AS_STRING
dprintf("nfs: nfs_params(ip:%lu, server:%s, export:%s, uid:%d, gid:%d, hostname:%s)\n", dprintf("nfs: nfs_params(ip:%lu, server:%s, export:%s, uid:%d, gid:%d, hostname:%s)\n",
parms->serverIP, parms->serverIP,
@@ -1476,7 +1484,6 @@ extern int
fs_open(fs_nspace *ns, fs_node *node, int omode, fs_file_cookie **cookie) fs_open(fs_nspace *ns, fs_node *node, int omode, fs_file_cookie **cookie)
{ {
struct stat st; struct stat st;
nfs_fhandle fhandle;
status_t result; status_t result;
if ((result=nfs_getattr(ns,&node->fhandle,&st))<B_OK) if ((result=nfs_getattr(ns,&node->fhandle,&st))<B_OK)
@@ -1502,6 +1509,9 @@ fs_open(fs_nspace *ns, fs_node *node, int omode, fs_file_cookie **cookie)
extern int extern int
fs_close(fs_nspace *ns, fs_node *node, fs_file_cookie *cookie) fs_close(fs_nspace *ns, fs_node *node, fs_file_cookie *cookie)
{ {
(void) ns;
(void) node;
(void) cookie;
/* //XXX:mmu_man:why that ?? makes Tracker go nuts updating the stats /* //XXX:mmu_man:why that ?? makes Tracker go nuts updating the stats
if ((cookie->omode & O_RDWR)||(cookie->omode & O_WRONLY)) if ((cookie->omode & O_RDWR)||(cookie->omode & O_WRONLY))
return my_notify_listener (B_STAT_CHANGED,ns->nsid,0,0,node->vnid,NULL); return my_notify_listener (B_STAT_CHANGED,ns->nsid,0,0,node->vnid,NULL);
@@ -1512,6 +1522,8 @@ fs_close(fs_nspace *ns, fs_node *node, fs_file_cookie *cookie)
extern int extern int
fs_free_cookie(fs_nspace *ns, fs_node *node, fs_file_cookie *cookie) fs_free_cookie(fs_nspace *ns, fs_node *node, fs_file_cookie *cookie)
{ {
(void) ns;
(void) node;
if (cookie) if (cookie)
free(cookie); free(cookie);
return B_OK; return B_OK;
@@ -1718,6 +1730,9 @@ fs_wstat(fs_nspace *ns, fs_node *node, struct stat *st, long mask)
extern int extern int
fs_wfsstat(fs_nspace *ns, struct fs_info *info, long mask) fs_wfsstat(fs_nspace *ns, struct fs_info *info, long mask)
{ {
(void) ns;
(void) info;
(void) mask;
return B_OK; return B_OK;
} }
@@ -1952,6 +1967,7 @@ fs_unlink(fs_nspace *ns, fs_node *dir, const char *name)
extern int extern int
fs_remove_vnode(fs_nspace *ns, fs_node *node, char r) fs_remove_vnode(fs_nspace *ns, fs_node *node, char r)
{ {
(void) r;
remove_node (ns,node->vnid); remove_node (ns,node->vnid);
return B_OK; return B_OK;
@@ -1961,6 +1977,8 @@ fs_remove_vnode(fs_nspace *ns, fs_node *node, char r)
extern int extern int
fs_secure_vnode(fs_nspace *ns, fs_node *node) fs_secure_vnode(fs_nspace *ns, fs_node *node)
{ {
(void) ns;
(void) node;
return B_OK; return B_OK;
} }
#endif #endif
@@ -1986,7 +2004,7 @@ fs_mkdir(fs_nspace *ns, fs_node *dir, const char *name, int perms)
if (result==B_OK) if (result==B_OK)
{ {
void *dummy; //void *dummy;
XDRInPacketDestroy (&reply); XDRInPacketDestroy (&reply);
XDROutPacketDestroy (&call); XDROutPacketDestroy (&call);
@@ -2375,6 +2393,9 @@ fs_symlink(fs_nspace *ns, fs_node *dir, const char *name, const char *path)
int fs_access(void *ns, void *node, int mode) int fs_access(void *ns, void *node, int mode)
{ {
(void) ns;
(void) node;
(void) mode;
/* XXX */ /* XXX */
return B_OK; return B_OK;
} }
@@ -19,6 +19,7 @@ typedef dev_t nspace_id;
#else #else
# include "fsproto.h" # include "fsproto.h"
# define publish_vnode new_vnode # define publish_vnode new_vnode
typedef int socklen_t;
#endif #endif