# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1557999857 -10800
# Node ID acb65ff40ce1ac3aca83511f58c517597bb20a29
# Parent  b3c1c5969a0b73cd07a2c0da41bbf021396c049b
Use stDBPrepareSQL_V() to simplify stPrepareSQL() and stDBPrepareSQL().

diff -r b3c1c5969a0b -r acb65ff40ce1 msitegen.inc.php
--- a/msitegen.inc.php	Thu May 16 12:43:48 2019 +0300
+++ b/msitegen.inc.php	Thu May 16 12:44:17 2019 +0300
@@ -623,62 +623,16 @@
 
 function stDBPrepareSQL($dbh)
 {
-  $argc = func_num_args();
   $argv = func_get_args();
-
-  $fmt = $argv[1];
-  $len = strlen($fmt);
-  $sql = "";
-  $argn = 2;
-  for ($pos = 0; $pos < $len; $pos++)
-  {
-    if ($fmt[$pos] == "%")
-    {
-      if ($argn < $argc)
-        $sql .= stDBGetSQLParam($dbh, $fmt[++$pos], $argv[$argn++]);
-      else
-      {
-        stLogError("Invalid SQL statement format string '".$fmt.
-          "', not enough parameters specified (".$argn." of ".$argc.")");
-        return FALSE;
-      }
-    }
-    else
-      $sql .= $fmt[$pos];
-  }
-
-  return $sql;
+  return stDBPrepareSQL_V($dbh, $argv[1], array_splice($argv, 2));
 }
 
 
 function stPrepareSQL()
 {
   global $db;
-  $argc = func_num_args();
   $argv = func_get_args();
-
-  $fmt = $argv[0];
-  $len = strlen($fmt);
-  $sql = "";
-  $argn = 1;
-  for ($pos = 0; $pos < $len; $pos++)
-  {
-    if ($fmt[$pos] == "%")
-    {
-      if ($argn < $argc)
-        $sql .= stDBGetSQLParam($db, $fmt[++$pos], $argv[$argn++]);
-      else
-      {
-        stLogError("Invalid SQL statement format string '".$fmt.
-          "', not enough parameters specified (".$argn." of ".$argc.")");
-        return FALSE;
-      }
-    }
-    else
-      $sql .= $fmt[$pos];
-  }
-
-  return $sql;
+  return stDBPrepareSQL_V($db, $argv[0], array_splice($argv, 1));
 }