Wed May 4 02:43:31 2016 UTC ()

avoid using mktemp since it triggers warnings

Bump rev.


(tnn)

diff -r1.4 -r1.5 pkgsrc/x11/libxshmfence/Makefile
diff -r1.2 -r1.3 pkgsrc/x11/libxshmfence/files/xshmfence_semaphore.c

--- pkgsrc/x11/libxshmfence/Makefile 2015/09/24 23:57:27 1.4
+++ pkgsrc/x11/libxshmfence/Makefile 2016/05/04 02:43:31 1.5

 @@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.4 2015/09/24 23:57:27 tnn Exp $
+# $NetBSD: Makefile,v 1.5 2016/05/04 02:43:31 tnn Exp $
 DISTNAME=	libxshmfence-1.2
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	http://xorg.freedesktop.org/archive/individual/lib/
 EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://xorg.freedesktop.org/
 COMMENT=	Shared memory 'SyncFence' synchronization primitive
 LICENSE=	mit
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config autoconf automake autoreconf

--- pkgsrc/x11/libxshmfence/files/xshmfence_semaphore.c 2015/09/24 23:57:27 1.2
+++ pkgsrc/x11/libxshmfence/files/xshmfence_semaphore.c 2016/05/04 02:43:31 1.3

 @@ -15,33 +15,36 @@
  * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
  * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
  * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
  * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
  * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  */
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
 #include <fcntl.h>
 #include <string.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <unistd.h>
 #include "xshmfenceint.h"
 static sem_t *mksemtemp(char *, const char *);
 #define LOCK() do {} while (sem_wait(f->lock) != 0)
 #define UNLOCK() do { sem_post(f->lock); } while (0)
 #define COND_WAIT() do {} while (sem_wait(f->cond) != 0)
 #define COND_SIGNAL() do { sem_post(f->cond); } while (0)
 /**
  * xshmfence_trigger:
  * @f: An X fence
+ *
  * Set @f to triggered, waking all waiters.
+ *
  * Return value: 0 on success and -1 on error (in which case, errno
  * will be set as appropriate).
 @@ -145,36 +148,32 @@ xshmfence_reset(struct xshmfence *f) {
  * Initialize the fence when first allocated
  **/
 void
 xshmfence_init(int fd)
+{
 	sem_t *lock;
 	sem_t *cond;
 	struct xshmfence f;
 	__sync_fetch_and_and(&f.refcnt, 0);
 	__sync_fetch_and_and(&f.triggered, 0);
 	__sync_fetch_and_and(&f.waiting, 0);
-	strlcpy(f.lockname, "/xshmfl-XXXX", sizeof(f.lockname));
+	lock = mksemtemp(f.lockname, "/xshmfl-%i");
 	mktemp(f.lockname);
 	lock = sem_open(f.lockname, O_CREAT|O_EXCL, 0600, 1);
 	if (lock == SEM_FAILED) {
 		err(EXIT_FAILURE, "xshmfence_init: sem_open");
+	}
-	strlcpy(f.condname, "/xshmfc-XXXX", sizeof(f.condname));
+	cond = mksemtemp(f.condname, "/xshmfl-%i");
 	mktemp(f.condname);
 	cond = sem_open(f.condname, O_CREAT|O_EXCL, 0600, 0);
 	if (cond == SEM_FAILED) {
 		err(EXIT_FAILURE, "xshmfence_init: sem_open");
+	}
 	sem_close(lock);
 	sem_close(cond);
 	pwrite(fd, &f, sizeof(f), 0);
+}
 /**
  * xshmfence_open_semaphore:
  * @f: An X fence
 @@ -211,13 +210,32 @@ xshmfence_open_semaphore(struct xshmfenc
+ *
  * Close the semaphore before unmapping the fence
  **/
 void
 xshmfence_close_semaphore(struct xshmfence *f)
+{
 	sem_close(f->lock);
 	sem_close(f->cond);
 	if (__sync_sub_and_fetch(&f->refcnt, 1) == 0) {
 		sem_unlink(f->lockname);
 		sem_unlink(f->condname);
+	}
+}
 static sem_t *
 mksemtemp(char *name, const char *template)
+{
 	sem_t *ret;
 	pid_t p;
 	p = getpid();
 	for(;;) {
 		sprintf(name, template, p);
 		ret = sem_open(name, O_CREAT|O_EXCL, 0600, 1);
 		if (ret == SEM_FAILED) {
 			if (errno == EEXIST) {
 				p++;
 				continue;
+			}
+		}
 		return ret;
+	}
+}