projects
/
nbd.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
57d59d6
)
r338: Oops, this is work-in-progress, remove
author
yoe <yoe>
Wed, 18 Jun 2008 10:46:40 +0000
(10:46 +0000)
committer
yoe <yoe>
Wed, 18 Jun 2008 10:46:40 +0000
(10:46 +0000)
nbd-server.c
patch
|
blob
|
history
diff --git
a/nbd-server.c
b/nbd-server.c
index
a683f8c
..
8f44c24
100644
(file)
--- a/
nbd-server.c
+++ b/
nbd-server.c
@@
-170,7
+170,6
@@
typedef enum {
**/
typedef struct {
gchar* exportname; /**< (unprocessed) filename of the file we're exporting */
**/
typedef struct {
gchar* exportname; /**< (unprocessed) filename of the file we're exporting */
- gchar* cowname; /**< template for the filename of the copy-on-write file */
off_t expected_size; /**< size of the exported file as it was told to
us through configuration */
gchar* listenaddr; /**< The IP address we're listening on */
off_t expected_size; /**< size of the exported file as it was told to
us through configuration */
gchar* listenaddr; /**< The IP address we're listening on */
@@
-559,7
+558,6
@@
GArray* parse_cfile(gchar* f, GError** e) {
{ "sparse_cow", FALSE, PARAM_BOOL, NULL, F_SPARSE },
{ "sdp", FALSE, PARAM_BOOL, NULL, F_SDP },
{ "listenaddr", FALSE, PARAM_STRING, NULL, 0 },
{ "sparse_cow", FALSE, PARAM_BOOL, NULL, F_SPARSE },
{ "sdp", FALSE, PARAM_BOOL, NULL, F_SDP },
{ "listenaddr", FALSE, PARAM_STRING, NULL, 0 },
- { "cowname", FALSE, PARAM_STRING, NULL, 0 },
};
const int lp_size=sizeof(lp)/sizeof(PARAM);
PARAM gp[] = {
};
const int lp_size=sizeof(lp)/sizeof(PARAM);
PARAM gp[] = {
@@
-606,9
+604,6
@@
GArray* parse_cfile(gchar* f, GError** e) {
lp[8].target=lp[9].target=lp[10].target=
lp[11].target=lp[12].target=&(s.flags);
lp[13].target=&(s.listenaddr);
lp[8].target=lp[9].target=lp[10].target=
lp[11].target=lp[12].target=&(s.flags);
lp[13].target=&(s.listenaddr);
- lp[14].target=&(s.cowname);
-
- s.cowname = "$F-$I-$P.diff";
/* After the [generic] group, start parsing exports */
if(i==1) {
/* After the [generic] group, start parsing exports */
if(i==1) {