projects
/
nbd.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix inline usage
[nbd.git]
/
nbd-server.c
diff --git
a/nbd-server.c
b/nbd-server.c
index
51b725c
..
5cace72
100644
(file)
--- a/
nbd-server.c
+++ b/
nbd-server.c
@@
-320,7
+320,7
@@
int authorized_client(CLIENT *opts) {
* @param buf a buffer
* @param len the number of bytes to be read
**/
* @param buf a buffer
* @param len the number of bytes to be read
**/
-inline void readit(int f, void *buf, size_t len) {
+static inline void readit(int f, void *buf, size_t len) {
ssize_t res;
while (len > 0) {
DEBUG("*");
ssize_t res;
while (len > 0) {
DEBUG("*");
@@
-342,7
+342,7
@@
inline void readit(int f, void *buf, size_t len) {
* @param buf a buffer containing data
* @param len the number of bytes to be written
**/
* @param buf a buffer containing data
* @param len the number of bytes to be written
**/
-inline void writeit(int f, void *buf, size_t len) {
+static inline void writeit(int f, void *buf, size_t len) {
ssize_t res;
while (len > 0) {
DEBUG("+");
ssize_t res;
while (len > 0) {
DEBUG("+");
@@
-1394,7
+1394,7
@@
int mainloop(CLIENT *client) {
err("Not enough magic.");
if (len > BUFSIZE - sizeof(struct nbd_reply)) {
currlen = BUFSIZE - sizeof(struct nbd_reply);
err("Not enough magic.");
if (len > BUFSIZE - sizeof(struct nbd_reply)) {
currlen = BUFSIZE - sizeof(struct nbd_reply);
- msg("INFO: oversized request (this is not a problem)");
+ msg2(LOG_INFO, "oversized request (this is not a problem)");
} else {
currlen = len;
}
} else {
currlen = len;
}
@@
-1745,7
+1745,7
@@
int serveloop(GArray* servers) {
memcpy(&rset, &mset, sizeof(fd_set));
if(select(max+1, &rset, NULL, NULL, NULL)>0) {
int net = 0;
memcpy(&rset, &mset, sizeof(fd_set));
if(select(max+1, &rset, NULL, NULL, NULL)>0) {
int net = 0;
- SERVER* serve;
+ SERVER* serve=NULL;
DEBUG("accept, ");
if(FD_ISSET(modernsock, &rset)) {
DEBUG("accept, ");
if(FD_ISSET(modernsock, &rset)) {
@@
-1757,6
+1757,7
@@
int serveloop(GArray* servers) {
close(net);
net=0;
}
close(net);
net=0;
}
+ serve = client->server;
}
for(i=0;i<servers->len && !net;i++) {
serve=&(g_array_index(servers, SERVER, i));
}
for(i=0;i<servers->len && !net;i++) {
serve=&(g_array_index(servers, SERVER, i));