Move bsdcontrol_* functions to bsdcontrol.c

ext/bsdcontrol.rb/bsdcontrol.c

@@ -1,6 +1,11 @@
 #include <ruby.h>
+#include <libhbsdcontrol.h>
+#include <fcntl.h>
+#include <errno.h>
+
 #include "context.h"
 #include "feature.h"
+#include "bsdcontrol.h"
 
 void
 Init_bsdcontrol(void)
@@ -22,3 +27,33 @@ Init_bsdcontrol(void)
     rb_define_const(rb_cFeature, "ENABLED", INT2NUM(HBSDCTRL_STATE_ENABLED));
     rb_define_const(rb_cFeature, "DISABLED", INT2NUM(HBSDCTRL_STATE_DISABLED));
 }
+
+int
+bsdcontrol_open(VALUE path)
+{
+    int fd;
+    Check_Type(path, T_STRING);
+    fd = open(RSTRING_PTR(path), O_PATH);
+    if (fd == -1)
+    {
+        rb_syserr_fail(errno, "open");
+    }
+    return fd;
+}
+
+hbsdctrl_ctx_t *
+bsdcontrol_unwrap(VALUE rbcontext)
+{
+    hbsdctrl_ctx_t *ctx;
+    Data_Get_Struct(rbcontext, hbsdctrl_ctx_t, ctx);
+    return ctx;
+}
+
+hbsdctrl_feature_t *
+bsdcontrol_find_feature(hbsdctrl_ctx_t *ctx, VALUE rbfeature)
+{
+    VALUE name;
+    name = rb_funcall(rbfeature, rb_intern("name"), 0);
+    Check_Type(name, T_STRING);
+    return hbsdctrl_ctx_find_feature_by_name(ctx, RSTRING_PTR(name));
+}

ext/bsdcontrol.rb/context.c

@@ -1,7 +1,7 @@
 #include <ruby.h>
 #include <libhbsdcontrol.h>
 #include "context.h"
-#include "glue.h"
+#include "bsdcontrol.h"
 
 static int FLAGS             = HBSDCTRL_FEATURE_STATE_FLAG_NONE;
 static const char *NAMESPACE = LIBHBSDCONTROL_DEFAULT_NAMESPACE;

ext/bsdcontrol.rb/feature.c

@@ -4,7 +4,7 @@
 #include <errno.h>
 #include "feature.h"
 #include "context.h"
-#include "glue.h"
+#include "bsdcontrol.h"
 
 /*
  * BSD::Control::Feature#status

ext/bsdcontrol.rb/glue.c

@@ -1,36 +0,0 @@
-#include <ruby.h>
-#include <libhbsdcontrol.h>
-#include <fcntl.h>
-#include <errno.h>
-#include "glue.h"
-#include "context.h"
-
-int
-bsdcontrol_open(VALUE path)
-{
-    int fd;
-    Check_Type(path, T_STRING);
-    fd = open(RSTRING_PTR(path), O_PATH);
-    if (fd == -1)
-    {
-        rb_syserr_fail(errno, "open");
-    }
-    return fd;
-}
-
-hbsdctrl_ctx_t *
-bsdcontrol_unwrap(VALUE rbcontext)
-{
-    hbsdctrl_ctx_t *ctx;
-    Data_Get_Struct(rbcontext, hbsdctrl_ctx_t, ctx);
-    return ctx;
-}
-
-hbsdctrl_feature_t *
-bsdcontrol_find_feature(hbsdctrl_ctx_t *ctx, VALUE rbfeature)
-{
-    VALUE name;
-    name = rb_funcall(rbfeature, rb_intern("name"), 0);
-    Check_Type(name, T_STRING);
-    return hbsdctrl_ctx_find_feature_by_name(ctx, RSTRING_PTR(name));
-}