swc

commit 1bd1820e59f4a9af588f9917e923346bb7d06e6a
parent 192d691e06c01ad9f99a42e6e04c0ea959a7b7ed
Author: Michael Forney <mforney@mforney.org>
Date:   Thu, 25 Dec 2014 00:52:55 -0800

launch: Drop swc_ prefix from non-public functions/structures

Diffstat:
M
libswc/compositor.c
 | 
2
+-
M
libswc/drm.c
 | 
2
+-
M
libswc/evdev_device.c
 | 
6
+++---
M
libswc/launch.c
 | 
8
++++----
M
libswc/launch.h
 | 
8
++++----
M
libswc/seat.c
 | 
2
+-
M
libswc/swc.c
 | 
6
+++---

7 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/libswc/compositor.c b/libswc/compositor.c
@@ -769,7 +769,7 @@ static void handle_switch_vt(void * data, uint32_t time,
     uint8_t vt = value - XKB_KEY_XF86Switch_VT_1 + 1;
 
     if (state == WL_KEYBOARD_KEY_STATE_PRESSED)
-        swc_launch_activate_vt(vt);
+        launch_activate_vt(vt);
 }
 
 static void handle_swc_event(struct wl_listener * listener, void * data)
diff --git a/libswc/drm.c b/libswc/drm.c
@@ -289,7 +289,7 @@ bool swc_drm_initialize()
     }
 
     drm.taken_ids = 0;
-    swc.drm->fd = swc_launch_open_device(drm.path, O_RDWR | O_CLOEXEC);
+    swc.drm->fd = launch_open_device(drm.path, O_RDWR | O_CLOEXEC);
 
     if (swc.drm->fd == -1)
     {
diff --git a/libswc/evdev_device.c b/libswc/evdev_device.c
@@ -204,7 +204,7 @@ struct swc_evdev_device * swc_evdev_device_new
     if (!(device = malloc(sizeof *device)))
         goto error0;
 
-    device->fd = swc_launch_open_device(path, O_RDWR | O_NONBLOCK | O_CLOEXEC);
+    device->fd = launch_open_device(path, O_RDWR | O_NONBLOCK | O_CLOEXEC);
 
     if (device->fd == -1)
     {
@@ -282,8 +282,8 @@ bool swc_evdev_device_reopen(struct swc_evdev_device * device)
     if (device->source)
         close_device(device);
 
-    device->fd = swc_launch_open_device(device->path,
-                                        O_RDWR | O_NONBLOCK | O_CLOEXEC);
+    device->fd = launch_open_device(device->path,
+                                    O_RDWR | O_NONBLOCK | O_CLOEXEC);
 
     if (device->fd == -1)
     {
diff --git a/libswc/launch.c b/libswc/launch.c
@@ -64,7 +64,7 @@ static int handle_data(int fd, uint32_t mask, void * data)
     return 1;
 }
 
-bool swc_launch_initialize()
+bool launch_initialize()
 {
     char * socket_string, * end;
 
@@ -85,7 +85,7 @@ bool swc_launch_initialize()
     return true;
 }
 
-void swc_launch_finalize()
+void launch_finalize()
 {
     wl_event_source_remove(launch.source);
     close(launch.socket);
@@ -114,7 +114,7 @@ static bool send_request(struct swc_launch_request * request, size_t size,
     return false;
 }
 
-int swc_launch_open_device(const char * path, int flags)
+int launch_open_device(const char * path, int flags)
 {
     size_t path_size = strlen(path);
     char buffer[sizeof(struct swc_launch_request) + path_size + 1];
@@ -132,7 +132,7 @@ int swc_launch_open_device(const char * path, int flags)
     return fd;
 }
 
-bool swc_launch_activate_vt(unsigned vt)
+bool launch_activate_vt(unsigned vt)
 {
     struct swc_launch_request request;
     struct swc_launch_event response;
diff --git a/libswc/launch.h b/libswc/launch.h
@@ -27,11 +27,11 @@
 #include <stdbool.h>
 #include <wayland-server.h>
 
-bool swc_launch_initialize();
-void swc_launch_finalize();
+bool launch_initialize();
+void launch_finalize();
 
-int swc_launch_open_device(const char * path, int flags);
-bool swc_launch_activate_vt(unsigned vt);
+int launch_open_device(const char * path, int flags);
+bool launch_activate_vt(unsigned vt);
 
 #endif
 
diff --git a/libswc/seat.c b/libswc/seat.c
@@ -233,7 +233,7 @@ static void update_capabilities(uint32_t capabilities)
 #ifdef ENABLE_LIBINPUT
 static int open_restricted(const char * path, int flags, void * user_data)
 {
-    return swc_launch_open_device(path, flags);
+    return launch_open_device(path, flags);
 }
 
 static void close_restricted(int fd, void * user_data)
diff --git a/libswc/swc.c b/libswc/swc.c
@@ -121,7 +121,7 @@ bool swc_initialize(struct wl_display * display,
     const char * default_seat = "seat0";
     wl_signal_init(&swc.event_signal);
 
-    if (!(swc_launch_initialize()))
+    if (!(launch_initialize()))
     {
         ERROR("Could not connect to swc-launch\n");
         goto error0;
@@ -222,7 +222,7 @@ bool swc_initialize(struct wl_display * display,
   error2:
     swc_drm_finalize();
   error1:
-    swc_launch_finalize();
+    launch_finalize();
   error0:
     return false;
 }
@@ -242,6 +242,6 @@ void swc_finalize()
     swc_bindings_finalize();
     swc_shm_finalize();
     swc_drm_finalize();
-    swc_launch_finalize();
+    launch_finalize();
 }