Lose unused stillborn psm threading stuff (didn't I already do this?)

diff --git a/lib/poptALL.c b/lib/poptALL.c
index 0a49d40..da3f59e 100644 (file)
--- a/lib/poptALL.c
+++ b/lib/poptALL.c
@@ -39,8 +39,6 @@ extern int _print_pkts;
 
 extern int _psm_debug;
 
-extern int _psm_threads;
-
 extern int _rpmal_debug;
 
 extern int _rpmdb_debug;
@@ -262,8 +260,6 @@ struct poptOption rpmcliAllPoptTable[] = {
        NULL, NULL},
  { "psmdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_psm_debug, -1,
        N_("debug package state machine"), NULL},
- { "psmthreads", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_psm_threads, -1,
-       N_("use threads for package state machine"), NULL},
  { "rpmaldebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmal_debug, -1,
        NULL, NULL},
  { "rpmdbdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmdb_debug, -1,

diff --git a/lib/psm.c b/lib/psm.c
index f23635b..fd86223 100644 (file)
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -31,7 +31,6 @@
 
 #define        _PSM_DEBUG      0
 int _psm_debug = _PSM_DEBUG;
-int _psm_threads = 0;
 
 /**
  */
@@ -1121,17 +1120,9 @@ rpmpsm rpmpsmNew(rpmts ts, rpmte te)
     return rpmpsmLink(psm, RPMDBG_M("rpmpsmNew"));
 }
 
-static void * rpmpsmThread(void * arg)
-{
-    rpmpsm psm = arg;
-    return ((void *) rpmpsmStage(psm, psm->nstage));
-}
-
 static int rpmpsmNext(rpmpsm psm, pkgStage nstage)
 {
     psm->nstage = nstage;
-    if (_psm_threads)
-       return rpmsqJoin( rpmsqThread(rpmpsmThread, psm) );
     return rpmpsmStage(psm, psm->nstage);
 }