Make kmod_new return a pointer

diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c
index 8547a2c8eb68159c36aa1a2072cb000b43a40206..ca17fde0fe66ced394a48d271bab432b4d05cf42 100644 (file)
--- a/libkmod/libkmod.c
+++ b/libkmod/libkmod.c
@@ -129,28 +129,28 @@ static int log_priority(const char *priority)
  *
  * Returns: a new kmod library context
  **/
-KMOD_EXPORT int kmod_new(struct kmod_ctx **ctx)
+KMOD_EXPORT struct kmod_ctx *kmod_new(void)
 {
        const char *env;
-       struct kmod_ctx *c;
+       struct kmod_ctx *ctx;
 
-       c = calloc(1, sizeof(struct kmod_ctx));
-       if (!c)
-               return -ENOMEM;
+       ctx = calloc(1, sizeof(struct kmod_ctx));
+       if (!ctx)
+               return NULL;
 
-       c->refcount = 1;
-       c->log_fn = log_stderr;
-       c->log_priority = LOG_ERR;
+       ctx->refcount = 1;
+       ctx->log_fn = log_stderr;
+       ctx->log_priority = LOG_ERR;
 
        /* environment overwrites config */
        env = getenv("KMOD_LOG");
        if (env != NULL)
-               kmod_set_log_priority(c, log_priority(env));
+               kmod_set_log_priority(ctx, log_priority(env));
 
-       info(c, "ctx %p created\n", c);
-       dbg(c, "log_priority=%d\n", c->log_priority);
-       *ctx = c;
-       return 0;
+       info(ctx, "ctx %p created\n", ctx);
+       dbg(ctx, "log_priority=%d\n", ctx->log_priority);
+
+       return ctx;
 }
 
 /**

diff --git a/libkmod/libkmod.h b/libkmod/libkmod.h
index 55c00745c54098209e82382c40747389ef213394..907341da173cfa57cc468b605439371dd90ce154 100644 (file)
--- a/libkmod/libkmod.h
+++ b/libkmod/libkmod.h
@@ -34,9 +34,9 @@ extern "C" {
  * environment, user variables, allows custom logging
  */
 struct kmod_ctx;
+struct kmod_ctx *kmod_new(void);
 struct kmod_ctx *kmod_ref(struct kmod_ctx *ctx);
 struct kmod_ctx *kmod_unref(struct kmod_ctx *ctx);
-int kmod_new(struct kmod_ctx **ctx);
 void kmod_set_log_fn(struct kmod_ctx *ctx,
                        void (*log_fn)(struct kmod_ctx *ctx,
                                int priority, const char *file, int line,