From 2571e21b4178a13ad298c637737520ae86b6b988 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 28 Mar 2017 22:37:38 -0400
Subject: [PATCH] libutil: Delete unused threadpool wrapper

This is dead code since 9cc98041953090160dde48afa69b97c936541cdb where
pull-local became just a wrapper for pull, which has its own threading.

Closes: #767
Approved by: jlebon
---
 Makefile-otutil.am             |  2 --
 src/libotutil/ot-spawn-utils.c | 49 ----------------------------------
 src/libotutil/ot-spawn-utils.h | 33 -----------------------
 src/libotutil/otutil.h         |  1 -
 4 files changed, 85 deletions(-)
 delete mode 100644 src/libotutil/ot-spawn-utils.c
 delete mode 100644 src/libotutil/ot-spawn-utils.h

diff --git a/Makefile-otutil.am b/Makefile-otutil.am
index 5b6d4e48..db632705 100644
--- a/Makefile-otutil.am
+++ b/Makefile-otutil.am
@@ -32,8 +32,6 @@ libotutil_la_SOURCES = \
 	src/libotutil/ot-opt-utils.h \
 	src/libotutil/ot-unix-utils.c \
 	src/libotutil/ot-unix-utils.h \
-	src/libotutil/ot-spawn-utils.c \
-	src/libotutil/ot-spawn-utils.h \
 	src/libotutil/ot-variant-utils.c \
 	src/libotutil/ot-variant-utils.h \
 	src/libotutil/ot-gio-utils.c \
diff --git a/src/libotutil/ot-spawn-utils.c b/src/libotutil/ot-spawn-utils.c
deleted file mode 100644
index f798264b..00000000
--- a/src/libotutil/ot-spawn-utils.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
- *
- * Copyright (C) 2011 Colin Walters <walters@verbum.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Colin Walters <walters@verbum.org>
- */
-
-#include "config.h"
-
-#include "otutil.h"
-
-#include <string.h>
-
-/**
- * ot_thread_pool_new_nproc:
- *
- * Like g_thread_pool_new (), but choose number of threads appropriate
- * for CPU bound workers automatically.  Also aborts on error.
- */
-GThreadPool *
-ot_thread_pool_new_nproc (GFunc     func,
-                          gpointer  user_data)
-{
-  long nproc_onln;
-  GThreadPool *ret;
-  GError *local_error = NULL;
-
-  nproc_onln = sysconf (_SC_NPROCESSORS_ONLN);
-  if (G_UNLIKELY (nproc_onln == -1 && errno == EINVAL))
-    nproc_onln = 2;
-  ret = g_thread_pool_new (func, user_data, (int)nproc_onln, FALSE, &local_error);
-  g_assert_no_error (local_error);
-  return ret;
-}
diff --git a/src/libotutil/ot-spawn-utils.h b/src/libotutil/ot-spawn-utils.h
deleted file mode 100644
index 76ea24e3..00000000
--- a/src/libotutil/ot-spawn-utils.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
- *
- * Copyright (C) 2011 Colin Walters <walters@verbum.org>.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Colin Walters <walters@verbum.org>
- */
-
-#pragma once
-
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-GThreadPool * ot_thread_pool_new_nproc (GFunc     func,
-                                        gpointer  user_data);
-                                        
-
-G_END_DECLS
diff --git a/src/libotutil/otutil.h b/src/libotutil/otutil.h
index f6158de8..dfe951d0 100644
--- a/src/libotutil/otutil.h
+++ b/src/libotutil/otutil.h
@@ -49,7 +49,6 @@
 #include <ot-opt-utils.h>
 #include <ot-unix-utils.h>
 #include <ot-variant-utils.h>
-#include <ot-spawn-utils.h>
 #include <ot-checksum-utils.h>
 #include <ot-gpg-utils.h>
 #include <ot-log-utils.h>