i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some warnings.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21301 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
François Revol
2007-06-03 00:45:56 +00:00
parent d329f1d6c1
commit 0f609eb290
1 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/disk/virtual/nbd/nbd.c
+30 -6
View File
@@ -15,6 +15,9 @@
#include <driver_settings.h> #include <driver_settings.h>
#include <Errors.h> #include <Errors.h>
#include <errno.h> #include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <ksocket.h> #include <ksocket.h>
#include <netinet/in.h> #include <netinet/in.h>
@@ -112,6 +115,18 @@ status_t nbd_free_request(struct nbd_device *dev, struct nbd_request_entry *req)
struct nbd_device *nbd_find_device(const char* name); struct nbd_device *nbd_find_device(const char* name);
int32 nbd_postoffice(void *arg);
status_t nbd_connect(struct nbd_device *dev);
status_t nbd_teardown(struct nbd_device *dev);
status_t nbd_post_request(struct nbd_device *dev, struct nbd_request_entry *req);
status_t nbd_open(const char *name, uint32 flags, cookie_t **cookie);
status_t nbd_close(cookie_t *cookie);
status_t nbd_free(cookie_t *cookie);
status_t nbd_control(cookie_t *cookie, uint32 op, void *data, size_t len);
status_t nbd_read(cookie_t *cookie, off_t position, void *data, size_t *numbytes);
status_t nbd_write(cookie_t *cookie, off_t position, const void *data, size_t *numbytes);
KSOCKET_MODULE_DECL; KSOCKET_MODULE_DECL;
/* HACK: /* HACK:
@@ -123,7 +138,9 @@ KSOCKET_MODULE_DECL;
bool gDelayUnload = false; bool gDelayUnload = false;
#define BONE_TEARDOWN_DELAY 60000000 #define BONE_TEARDOWN_DELAY 60000000
#if 0
#pragma mark ==== support ==== #pragma mark ==== support ====
#endif
// move that to ksocket inlined // move that to ksocket inlined
static int kinet_aton(const char *in, struct in_addr *addr) static int kinet_aton(const char *in, struct in_addr *addr)
@@ -131,7 +148,7 @@ static int kinet_aton(const char *in, struct in_addr *addr)
int i; int i;
unsigned long a; unsigned long a;
uint32 inaddr = 0L; uint32 inaddr = 0L;
const char *p = in; char *p = (char *)in;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
a = strtoul(p, &p, 10); a = strtoul(p, &p, 10);
if (!p) if (!p)
@@ -145,7 +162,9 @@ static int kinet_aton(const char *in, struct in_addr *addr)
return 0; return 0;
} }
#if 0
#pragma mark ==== request manager ==== #pragma mark ==== request manager ====
#endif
status_t nbd_alloc_request(struct nbd_device *dev, struct nbd_request_entry **req, uint32 type, off_t from, size_t len, const char *data) status_t nbd_alloc_request(struct nbd_device *dev, struct nbd_request_entry **req, uint32 type, off_t from, size_t len, const char *data)
{ {
@@ -194,7 +213,7 @@ status_t nbd_alloc_request(struct nbd_device *dev, struct nbd_request_entry **re
r->req.from = B_HOST_TO_BENDIAN_INT64(r->from); r->req.from = B_HOST_TO_BENDIAN_INT64(r->from);
r->req.len = B_HOST_TO_BENDIAN_INT32(len); r->req.len = B_HOST_TO_BENDIAN_INT32(len);
r->buffer = w ? data : (((char *)r) + sizeof(struct nbd_request_entry)); r->buffer = (void *)(w ? data : (((char *)r) + sizeof(struct nbd_request_entry)));
*req = r; *req = r;
return B_OK; return B_OK;
@@ -246,14 +265,15 @@ status_t nbd_free_request(struct nbd_device *dev, struct nbd_request_entry *req)
#if 0
#pragma mark ==== nbd handler ==== #pragma mark ==== nbd handler ====
#endif
int32 nbd_postoffice(void *arg) int32 nbd_postoffice(void *arg)
{ {
struct nbd_device *dev = (struct nbd_device *)arg; struct nbd_device *dev = (struct nbd_device *)arg;
struct nbd_request_entry *req = NULL; struct nbd_request_entry *req = NULL;
struct nbd_reply reply; struct nbd_reply reply;
int sock = dev->sock;
status_t err; status_t err;
const char *reason; const char *reason;
PRINT((DP ">%s()\n", __FUNCTION__)); PRINT((DP ">%s()\n", __FUNCTION__));
@@ -352,7 +372,7 @@ status_t nbd_connect(struct nbd_device *dev)
//err = ENOSYS; //err = ENOSYS;
if (err == -1 && errno < 0) if (err == -1 && errno < 0)
err = errno; err = errno;
/* HACK: avoid the kernel unlading us with locked pages from TCP */ /* HACK: avoid the kernel unloading us with locked pages from TCP */
if (err) if (err)
gDelayUnload = true; gDelayUnload = true;
if (err) if (err)
@@ -426,7 +446,9 @@ status_t nbd_post_request(struct nbd_device *dev, struct nbd_request_entry *req)
} }
#if 0
#pragma mark ==== device hooks ==== #pragma mark ==== device hooks ====
#endif
static struct nbd_device nbd_devices[MAX_NBDS]; static struct nbd_device nbd_devices[MAX_NBDS];
@@ -437,7 +459,7 @@ status_t nbd_open(const char *name, uint32 flags, cookie_t **cookie) {
int kfd; int kfd;
#endif #endif
struct nbd_device *dev = NULL; struct nbd_device *dev = NULL;
PRINT((DP ">%s(%s, %x, )\n", __FUNCTION__, name, flags)); PRINT((DP ">%s(%s, %lx, )\n", __FUNCTION__, name, flags));
(void)name; (void)flags; (void)name; (void)flags;
dev = nbd_find_device(name); dev = nbd_find_device(name);
if (!dev || !dev->valid) if (!dev || !dev->valid)
@@ -532,7 +554,7 @@ status_t nbd_free(cookie_t *cookie) {
} }
status_t nbd_control(cookie_t *cookie, uint32 op, void *data, size_t len) { status_t nbd_control(cookie_t *cookie, uint32 op, void *data, size_t len) {
PRINT((DP ">%s(%d, %lu, , %d)\n", __FUNCTION__, WHICH(cookie->dev), op, len)); PRINT((DP ">%s(%d, %lu, , %ld)\n", __FUNCTION__, WHICH(cookie->dev), op, len));
switch (op) { switch (op) {
case B_GET_DEVICE_SIZE: /* this one is broken anyway... */ case B_GET_DEVICE_SIZE: /* this one is broken anyway... */
if (data) { if (data) {
@@ -738,7 +760,9 @@ device_hooks nbd_hooks={
NULL NULL
}; };
#if 0
#pragma mark ==== driver hooks ==== #pragma mark ==== driver hooks ====
#endif
int32 api_version = B_CUR_DRIVER_API_VERSION; int32 api_version = B_CUR_DRIVER_API_VERSION;