udev: check-keymaps.sh - fix source directory

[elogind.git] / src / udev / libudev.c

diff --git a/src/udev/libudev.c b/src/udev/libudev.c
index dcba15de41b0fb687069ae76721b1fef15aaab6a..74b53cbf1b59e7bcdb0b353081f6df4e0decca8a 100644 (file)
--- a/src/udev/libudev.c
+++ b/src/udev/libudev.c
@@ -79,7 +79,7 @@ static void log_stderr(struct udev *udev,
  *
  * Returns: stored userdata
  **/
-UDEV_EXPORT void *udev_get_userdata(struct udev *udev)
+_public_ void *udev_get_userdata(struct udev *udev)
 {
         if (udev == NULL)
                 return NULL;
@@ -93,7 +93,7 @@ UDEV_EXPORT void *udev_get_userdata(struct udev *udev)
  *
  * Store custom @userdata in the library context.
  **/
-UDEV_EXPORT void udev_set_userdata(struct udev *udev, void *userdata)
+_public_ void udev_set_userdata(struct udev *udev, void *userdata)
 {
         if (udev == NULL)
                 return;
@@ -119,7 +119,7 @@ static char *set_value(char **s, const char *v)
  *
  * Returns: a new udev library context
  **/
-UDEV_EXPORT struct udev *udev_new(void)
+_public_ struct udev *udev_new(void)
 {
         struct udev *udev;
         const char *env;
@@ -261,24 +261,17 @@ UDEV_EXPORT struct udev *udev_new(void)
                         goto err;
 
                 /* /run/udev -- runtime rules */
-                if (asprintf(&udev->rules_path[2], "%s/rules.d", udev->run_path) < 0)
+                if (asprintf(&udev->rules_path[1], "%s/rules.d", udev->run_path) < 0)
                         goto err;
 
                 /* /etc/udev -- local administration rules */
-                udev->rules_path[1] = strdup(SYSCONFDIR "/udev/rules.d");
-                if (!udev->rules_path[1])
+                udev->rules_path[2] = strdup(SYSCONFDIR "/udev/rules.d");
+                if (!udev->rules_path[2])
                         goto err;
 
                 udev->rules_path_count = 3;
         }
 
-        dbg(udev, "context %p created\n", udev);
-        dbg(udev, "log_priority=%d\n", udev->log_priority);
-        dbg(udev, "config_file='%s'\n", config_file);
-        dbg(udev, "dev_path='%s'\n", udev->dev_path);
-        dbg(udev, "sys_path='%s'\n", udev->sys_path);
-        dbg(udev, "run_path='%s'\n", udev->run_path);
-        dbg(udev, "rules_path='%s':'%s':'%s'\n", udev->rules_path[0], udev->rules_path[1], udev->rules_path[2]);
         free(config_file);
         return udev;
 err:
@@ -296,7 +289,7 @@ err:
  *
  * Returns: the passed udev library context
  **/
-UDEV_EXPORT struct udev *udev_ref(struct udev *udev)
+_public_ struct udev *udev_ref(struct udev *udev)
 {
         if (udev == NULL)
                 return NULL;
@@ -312,7 +305,7 @@ UDEV_EXPORT struct udev *udev_ref(struct udev *udev)
  * reaches zero, the resources of the context will be released.
  *
  **/
-UDEV_EXPORT void udev_unref(struct udev *udev)
+_public_ void udev_unref(struct udev *udev)
 {
         if (udev == NULL)
                 return;
@@ -326,7 +319,6 @@ UDEV_EXPORT void udev_unref(struct udev *udev)
         free(udev->rules_path[1]);
         free(udev->rules_path[2]);
         free(udev->run_path);
-        dbg(udev, "context %p released\n", udev);
         free(udev);
 }
 
@@ -340,13 +332,13 @@ UDEV_EXPORT void udev_unref(struct udev *udev)
  * into the users' logging functionality.
  *
  **/
-UDEV_EXPORT void udev_set_log_fn(struct udev *udev,
+_public_ void udev_set_log_fn(struct udev *udev,
                      void (*log_fn)(struct udev *udev,
                                     int priority, const char *file, int line, const char *fn,
                                     const char *format, va_list args))
 {
         udev->log_fn = log_fn;
-        info(udev, "custom logging function %p registered\n", log_fn);
+        dbg(udev, "custom logging function %p registered\n", log_fn);
 }
 
 /**
@@ -358,7 +350,7 @@ UDEV_EXPORT void udev_set_log_fn(struct udev *udev,
  *
  * Returns: the current logging priority
  **/
-UDEV_EXPORT int udev_get_log_priority(struct udev *udev)
+_public_ int udev_get_log_priority(struct udev *udev)
 {
         return udev->log_priority;
 }
@@ -371,7 +363,7 @@ UDEV_EXPORT int udev_get_log_priority(struct udev *udev)
  * Set the current logging priority. The value controls which messages
  * are logged.
  **/
-UDEV_EXPORT void udev_set_log_priority(struct udev *udev, int priority)
+_public_ void udev_set_log_priority(struct udev *udev, int priority)
 {
         char num[32];
 
@@ -398,7 +390,7 @@ int udev_get_rules_path(struct udev *udev, char **path[], unsigned long long *st
  *
  * Returns: the sys mount point
  **/
-UDEV_EXPORT const char *udev_get_sys_path(struct udev *udev)
+_public_ const char *udev_get_sys_path(struct udev *udev)
 {
         if (udev == NULL)
                 return NULL;
@@ -415,7 +407,7 @@ UDEV_EXPORT const char *udev_get_sys_path(struct udev *udev)
  *
  * Returns: the device directory path
  **/
-UDEV_EXPORT const char *udev_get_dev_path(struct udev *udev)
+_public_ const char *udev_get_dev_path(struct udev *udev)
 {
         if (udev == NULL)
                 return NULL;
@@ -430,7 +422,7 @@ UDEV_EXPORT const char *udev_get_dev_path(struct udev *udev)
  *
  * Returns: the runtime directory path
  **/
-UDEV_EXPORT const char *udev_get_run_path(struct udev *udev)
+_public_ const char *udev_get_run_path(struct udev *udev)
 {
         if (udev == NULL)
                 return NULL;