Inlined fuse_session_new()

This function is only used in one place.

diff --git a/lib/fuse_i.h b/lib/fuse_i.h
index 62af9f27ffd58f03078895b6314e2f373db82874..6738197b1b9c23d72506c5193f9998be5e1c82f8 100644 (file)
--- a/lib/fuse_i.h
+++ b/lib/fuse_i.h
@@ -116,13 +116,6 @@ struct fuse_module {
 int fuse_chan_clearfd(struct fuse_chan *ch);
 void fuse_chan_close(struct fuse_chan *ch);
 
-/**
- * Create a new session
- *
- * @return new session object, or NULL on failure
- */
-struct fuse_session *fuse_session_new(void);
-
 /**
  * Create a new channel
  *

diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c
index 31714ddf40c01fd6acf0c3c399ba0a29486ec421..b4258563539c254f816eddbbdd8e3f601f2016eb 100755 (executable)
--- a/lib/fuse_lowlevel.c
+++ b/lib/fuse_lowlevel.c
@@ -2907,12 +2907,13 @@ struct fuse_session *fuse_lowlevel_new(struct fuse_args *args,
        f->owner = getuid();
        f->userdata = userdata;
 
-       se = fuse_session_new();
-       if (!se)
+       se = (struct fuse_session *) malloc(sizeof(*se));
+       if (se == NULL) {
+               fprintf(stderr, "fuse: failed to allocate session\n");
                goto out_key_destroy;
-
+       }
+       memset(se, 0, sizeof(*se));
        se->f = f;
-
        return se;
 
 out_key_destroy:

diff --git a/lib/fuse_session.c b/lib/fuse_session.c
index 6b54e43983526ce4f43e39464791046abdeacdbc..cdf20f7c3b32998ada4c0b7ed89b4283b2bdc2fe 100644 (file)
--- a/lib/fuse_session.c
+++ b/lib/fuse_session.c
@@ -17,18 +17,6 @@
 #include <errno.h>
 
 
-struct fuse_session *fuse_session_new(void)
-{
-       struct fuse_session *se = (struct fuse_session *) malloc(sizeof(*se));
-       if (se == NULL) {
-               fprintf(stderr, "fuse: failed to allocate session\n");
-               return NULL;
-       }
-       memset(se, 0, sizeof(*se));
-
-       return se;
-}
-
 void fuse_session_add_chan(struct fuse_session *se, struct fuse_chan *ch)
 {
        assert(se->ch == NULL);