repositories
/
deb_libnfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
WIN32: More ifdef cleanups
[deb_libnfs.git]
/
lib
/
libnfs-sync.c
diff --git
a/lib/libnfs-sync.c
b/lib/libnfs-sync.c
index 82578f1e9a07fbfb39798ad88986065e9ebcf3cd..fe711ac5f58ccce6656c93356242a869f5adeb9a 100644
(file)
--- a/
lib/libnfs-sync.c
+++ b/
lib/libnfs-sync.c
@@
-19,25
+19,39
@@
*/
#ifdef WIN32
#include "win32_compat.h"
*/
#ifdef WIN32
#include "win32_compat.h"
-#define DllExport
#else
#include <strings.h>
#include <unistd.h>
#else
#include <strings.h>
#include <unistd.h>
-#include <sys/statvfs.h>
-#include <poll.h>
#include <sys/ioctl.h>
#include <netdb.h>
#include <sys/socket.h>
#include <net/if.h>
#include <sys/ioctl.h>
#include <netdb.h>
#include <sys/socket.h>
#include <net/if.h>
-#endif
+
+#ifdef AROS
+#include "aros_compat.h"
+#else
+#ifdef ANDROID
+#include <netinet/in.h>
+#include <sys/vfs.h>
+#define statvfs statfs
+#else
+#include <sys/statvfs.h>
+#endif /*ANDRIOD*/
+#endif /*AROS*/
+#endif /*WIN32*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
+#ifdef HAVE_POLL_H
+#include <poll.h>
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <assert.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
@@
-67,6
+81,8
@@
static void wait_for_reply(struct rpc_context *rpc, struct sync_cb_data *cb_data
{
struct pollfd pfd;
{
struct pollfd pfd;
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
while (!cb_data->is_finished) {
pfd.fd = rpc_get_fd(rpc);
while (!cb_data->is_finished) {
pfd.fd = rpc_get_fd(rpc);
@@
-135,6
+151,8
@@
int nfs_mount(struct nfs_context *nfs, const char *server, const char *export)
struct sync_cb_data cb_data;
struct rpc_context *rpc = nfs_get_rpc_context(nfs);
struct sync_cb_data cb_data;
struct rpc_context *rpc = nfs_get_rpc_context(nfs);
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
cb_data.is_finished = 0;
if (nfs_mount_async(nfs, server, export, mount_cb, &cb_data) != 0) {
cb_data.is_finished = 0;
if (nfs_mount_async(nfs, server, export, mount_cb, &cb_data) != 0) {
@@
-1149,6
+1167,8
@@
void mount_getexports_cb(struct rpc_context *mount_context, int status, void *da
struct sync_cb_data *cb_data = private_data;
exports export;
struct sync_cb_data *cb_data = private_data;
exports export;
+ assert(mount_context->magic == RPC_CONTEXT_MAGIC);
+
cb_data->is_finished = 1;
cb_data->status = status;
cb_data->return_data = NULL;
cb_data->is_finished = 1;
cb_data->status = status;
cb_data->return_data = NULL;
@@
-1230,6
+1250,8
@@
void callit_cb(struct rpc_context *rpc, int status, void *data _U_, void *privat
char hostdd[16];
struct nfs_server_list *srvr;
char hostdd[16];
struct nfs_server_list *srvr;
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
if (status == RPC_STATUS_CANCEL) {
return;
}
if (status == RPC_STATUS_CANCEL) {
return;
}
@@
-1283,6
+1305,8
@@
static int send_nfsd_probes(struct rpc_context *rpc, INTERFACE_INFO *InterfaceLi
{
int i=0;
{
int i=0;
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
for(i = 0; i < numIfs; i++)
{
SOCKADDR *pAddress;
for(i = 0; i < numIfs; i++)
{
SOCKADDR *pAddress;
@@
-1413,6
+1437,8
@@
static int send_nfsd_probes(struct rpc_context *rpc, struct ifconf *ifc, struct
{
char *ptr;
{
char *ptr;
+ assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
for (ptr =(char *)(ifc->ifc_buf); ptr < (char *)(ifc->ifc_buf) + ifc->ifc_len; ) {
struct ifreq *ifr;
char bcdd[16];
for (ptr =(char *)(ifc->ifc_buf); ptr < (char *)(ifc->ifc_buf) + ifc->ifc_len; ) {
struct ifreq *ifr;
char bcdd[16];