From fae0dfa59b3111fecc7b8de8493eaaee165a102a Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Sat, 11 Jan 2014 02:50:08 +0000 Subject: gbm: use the loader util lib MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Additionally this commit removes the following exported functions _gbm_udev_device_new_from_fd() _gbm_fd_get_device_name() _gbm_log() All three were erroneously marked as exported since their inception. Neither of them has ever been a part of the API thus there should be no users of them. Cc: Chad Versace Cc: Kristian Høgsberg Signed-off-by: Emil Velikov Reviewed-by: Rob Clark Reviewed-by: Kristian Høgsberg Reviewed-by: Ian Romanick --- src/gbm/main/common.c | 88 --------------------------------------------------- src/gbm/main/common.h | 42 ------------------------ src/gbm/main/gbm.c | 1 - 3 files changed, 131 deletions(-) delete mode 100644 src/gbm/main/common.c delete mode 100644 src/gbm/main/common.h (limited to 'src/gbm/main') diff --git a/src/gbm/main/common.c b/src/gbm/main/common.c deleted file mode 100644 index f02162df292..00000000000 --- a/src/gbm/main/common.c +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright © 2011 Intel Corporation - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - * - * Authors: - * Benjamin Franzke - */ - -#include -#include - -#include -#include -#include -#include - -#include "common.h" -#include "gbmint.h" - -GBM_EXPORT struct udev_device * -_gbm_udev_device_new_from_fd(struct udev *udev, int fd) -{ - struct udev_device *device; - struct stat buf; - - if (fstat(fd, &buf) < 0) { - fprintf(stderr, "gbm: failed to stat fd %d", fd); - return NULL; - } - - device = udev_device_new_from_devnum(udev, 'c', buf.st_rdev); - if (device == NULL) { - fprintf(stderr, - "gbm: could not create udev device for fd %d", fd); - return NULL; - } - - return device; -} - -GBM_EXPORT char * -_gbm_fd_get_device_name(int fd) -{ - struct udev *udev; - struct udev_device *device; - const char *const_device_name; - char *device_name = NULL; - - udev = udev_new(); - device = _gbm_udev_device_new_from_fd(udev, fd); - if (device == NULL) - return NULL; - - const_device_name = udev_device_get_devnode(device); - if (!const_device_name) - goto out; - device_name = strdup(const_device_name); - -out: - udev_device_unref(device); - udev_unref(udev); - - return device_name; -} - -GBM_EXPORT void -_gbm_log(const char *fmt_str, ...) -{ -} diff --git a/src/gbm/main/common.h b/src/gbm/main/common.h deleted file mode 100644 index 1fcdfcac30d..00000000000 --- a/src/gbm/main/common.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright © 2011 Intel Corporation - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - * - * Authors: - * Benjamin Franzke - */ - -#ifndef _COMMON_H_ -#define _COMMON_H_ - -#include - -struct udev_device * -_gbm_udev_device_new_from_fd(struct udev *udev, int fd); - -char * -_gbm_fd_get_device_name(int fd); - -void -_gbm_log(const char *fmt_str, ...); - -#endif diff --git a/src/gbm/main/gbm.c b/src/gbm/main/gbm.c index c58576dd940..72eeabf3140 100644 --- a/src/gbm/main/gbm.c +++ b/src/gbm/main/gbm.c @@ -39,7 +39,6 @@ #include "gbm.h" #include "gbmint.h" -#include "common.h" #include "backend.h" #define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) -- cgit v1.2.3