From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D49C9139085 for ; Thu, 29 Dec 2016 02:25:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A0E3AE0C03; Thu, 29 Dec 2016 02:25:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 746EFE0BFE for ; Thu, 29 Dec 2016 02:25:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7C83533BEBE for ; Thu, 29 Dec 2016 02:25:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0F4B924F3 for ; Thu, 29 Dec 2016 02:25:52 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1482967997.ec10bc915b138dc729ee42faf152d2ae0a63331a.vapier@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: /, libq/ X-VCS-Repository: proj/portage-utils X-VCS-Files: .depend Makefile.am libq/libq.c libq/xgetcwd.c libq/xreadlink.c X-VCS-Directories: / libq/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: ec10bc915b138dc729ee42faf152d2ae0a63331a X-VCS-Branch: master Date: Thu, 29 Dec 2016 02:25:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e65e105a-519d-4ddb-9770-75778c55fd1f X-Archives-Hash: 14879903fa52e93a720452ca3496547a commit: ec10bc915b138dc729ee42faf152d2ae0a63331a Author: Mike Frysinger gentoo org> AuthorDate: Wed Dec 28 23:33:17 2016 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Wed Dec 28 23:33:17 2016 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=ec10bc91 libq: drop unused xgetcwd/xreadlink helpers .depend | 13 ++++++------- Makefile.am | 2 -- libq/libq.c | 2 -- libq/xgetcwd.c | 17 ----------------- libq/xreadlink.c | 17 ----------------- 5 files changed, 6 insertions(+), 45 deletions(-) diff --git a/.depend b/.depend index 3b63d1f..d824273 100644 --- a/.depend +++ b/.depend @@ -2,10 +2,9 @@ main.o: main.c porting.h main.h libq/libq.c libq/busybox.h libq/i18n.h \ libq/libq.h libq/colors.c libq/xmalloc.c libq/xstrdup.c libq/xasprintf.c \ libq/hash_fd.c libq/md5_sha1_sum.c libq/human_readable.c libq/rmspace.c \ libq/compat.c libq/copy_file.c libq/safe_io.c libq/xchdir.c \ - libq/xgetcwd.c libq/xmkdir.c libq/xreadlink.c libq/xregex.c \ - libq/xsystem.c libq/xarray.c libq/atom_explode.c libq/atom_compare.c \ - libq/basename.c libq/scandirat.c libq/prelink.c libq/profile.c \ - libq/vdb.c libq/vdb_get_next_dir.c libq/virtuals.c applets.h \ - include_applets.h q.c qcheck.c qdepends.c qfile.c qlist.c qlop.c \ - qsearch.c qsize.c qtbz2.c quse.c qxpak.c qpkg.c qgrep.c qatom.c qmerge.c \ - qcache.c qglsa.c + libq/xmkdir.c libq/xregex.c libq/xsystem.c libq/xarray.c \ + libq/atom_explode.c libq/atom_compare.c libq/basename.c libq/scandirat.c \ + libq/prelink.c libq/profile.c libq/vdb.c libq/vdb_get_next_dir.c \ + libq/virtuals.c applets.h include_applets.h q.c qcheck.c qdepends.c \ + qfile.c qlist.c qlop.c qsearch.c qsize.c qtbz2.c quse.c qxpak.c qpkg.c \ + qgrep.c qatom.c qmerge.c qcache.c qglsa.c diff --git a/Makefile.am b/Makefile.am index 7b9c35b..7d4a301 100644 --- a/Makefile.am +++ b/Makefile.am @@ -122,10 +122,8 @@ EXTRA_DIST += \ libq/xarray.c \ libq/xasprintf.c \ libq/xchdir.c \ - libq/xgetcwd.c \ libq/xmalloc.c \ libq/xmkdir.c \ - libq/xreadlink.c \ libq/xregex.c \ libq/xstrdup.c \ libq/xsystem.c \ diff --git a/libq/libq.c b/libq/libq.c index 5c6eb5c..28fe5d1 100644 --- a/libq/libq.c +++ b/libq/libq.c @@ -22,9 +22,7 @@ #include "copy_file.c" #include "safe_io.c" #include "xchdir.c" -#include "xgetcwd.c" #include "xmkdir.c" -#include "xreadlink.c" #include "xregex.c" #include "xsystem.c" #include "xarray.c" diff --git a/libq/xgetcwd.c b/libq/xgetcwd.c deleted file mode 100644 index 31f531d..0000000 --- a/libq/xgetcwd.c +++ /dev/null @@ -1,17 +0,0 @@ -/* - * utility funcs - * - * Copyright 2005-2014 Gentoo Foundation - * Distributed under the terms of the GNU General Public License v2 - */ - -#include - -char *xgetcwd(char *buf, size_t size); -char *xgetcwd(char *buf, size_t size) -{ - char *ret = getcwd(buf, size); - if (unlikely(ret == NULL)) - errp("getcwd() failed"); - return ret; -} diff --git a/libq/xreadlink.c b/libq/xreadlink.c deleted file mode 100644 index 872264f..0000000 --- a/libq/xreadlink.c +++ /dev/null @@ -1,17 +0,0 @@ -/* - * utility funcs - * - * Copyright 2005-2014 Gentoo Foundation - * Distributed under the terms of the GNU General Public License v2 - */ - -#include - -ssize_t xreadlink(const char *path, char *buf, size_t bufsiz); -ssize_t xreadlink(const char *path, char *buf, size_t bufsiz) -{ - ssize_t ret = readlink(path, buf, bufsiz); - if (unlikely(ret == -1)) - errp("readlink(%s) failed", path); - return ret; -}