From: pweilbacher <pweilbacher@noemail.net>
Date: Tue, 2 Oct 2007 19:56:04 +0000 (+0000)
Subject: Use local variables instead of #defines for the mutex name and length in OS/2's sqlit... 
X-Git-Tag: version-3.6.10~1724
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ae1463b941c1e19ae939bc216f9db55e92c4e748;p=thirdparty%2Fsqlite.git

Use local variables instead of #defines for the mutex name and length in OS/2's sqlite3_mutex_alloc(). (CVS 4453)

FossilOrigin-Name: 272959cc91d0c9299d6fca8a962eb563650af87b
---

diff --git a/manifest b/manifest
index f6ee0cd8c0..43b17e8a6c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Additional\s#ifdefing\saround\s_XOPEN_SOURCE.\s\sTicket\s#2681.\s(CVS\s4452)
-D 2007-10-01T17:47:00
+C Use\slocal\svariables\sinstead\sof\s#defines\sfor\sthe\smutex\sname\sand\slength\sin\sOS/2's\ssqlite3_mutex_alloc().\s(CVS\s4453)
+D 2007-10-02T19:56:04
 F Makefile.in cbfb898945536a8f9ea8b897e1586dd1fdbcc5db
 F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -106,7 +106,7 @@ F src/mem1.c 1f85902b98b38bd8a8b0c24012933957256db13e
 F src/mem2.c b97b4662bf5902cbde0a849c4739e64ce7b07177
 F src/mutex.c 3259f62c2429967aee6dc112117a6d2f499ef061
 F src/mutex.h 079fa6fe9da18ceb89e79012c010594c6672addb
-F src/mutex_os2.c 07a2d5db7a6b1f6716dbb44dfaa79e9f24bcf20c
+F src/mutex_os2.c 7fe4773e98ed74a63b2e54fc557929eb155f6269
 F src/mutex_unix.c ff77650261a245035b79c5c8a174f4e05d3cae8a
 F src/mutex_w32.c d2c56fb81aca10af1577bdae2a4083eb2505f8ee
 F src/os.c 3b66834a5853ddaa83dfd6c146be9e4fc1864b98
@@ -580,7 +580,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P ebe3e6913c35bebb0e78dac995527d5da97a9377
-R cfc075825147a4ccdcc8d892e7e61dcc
-U drh
-Z fd115abb078ffce00ef35ed41bd4c589
+P eb5d78451ee2a5d8480537530f30fbb305bf7632
+R a8abd8d07626f709082a5e1aa7c6fdec
+U pweilbacher
+Z 73d6f9cab3860483d902ed77f0494d38
diff --git a/manifest.uuid b/manifest.uuid
index bd5937a412..74f3abffd6 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-eb5d78451ee2a5d8480537530f30fbb305bf7632
\ No newline at end of file
+272959cc91d0c9299d6fca8a962eb563650af87b
\ No newline at end of file
diff --git a/src/mutex_os2.c b/src/mutex_os2.c
index f175e0f815..e0258c7563 100644
--- a/src/mutex_os2.c
+++ b/src/mutex_os2.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** This file contains the C functions that implement mutexes for OS/2
 **
-** $Id: mutex_os2.c,v 1.2 2007/09/20 21:40:23 pweilbacher Exp $
+** $Id: mutex_os2.c,v 1.3 2007/10/02 19:56:04 pweilbacher Exp $
 */
 #include "sqliteInt.h"
 
@@ -78,8 +78,8 @@ struct sqlite3_mutex {
 ** the same type number.
 */
 sqlite3_mutex *sqlite3_mutex_alloc(int iType){
-#define MUTEX_NAME "\\SEM32\\SQLITE\\MUTEX"
-#define MUTEX_NAME_LEN 20 /* name length + null byte */
+  PSZ mutex_name = "\\SEM32\\SQLITE\\MUTEX";
+  int mutex_name_len = strlen(mutex_name) + 1; /* name length + null byte */
   sqlite3_mutex *p;
 
   switch( iType ){
@@ -87,8 +87,8 @@ sqlite3_mutex *sqlite3_mutex_alloc(int iType){
     case SQLITE_MUTEX_RECURSIVE: {
       p = sqlite3MallocZero( sizeof(*p) );
       if( p ){
-        p->mutexName = (PSZ)malloc(MUTEX_NAME_LEN);
-        sqlite3_snprintf(MUTEX_NAME_LEN, p->mutexName, "%s", MUTEX_NAME);
+        p->mutexName = (PSZ)malloc(mutex_name_len);
+        sqlite3_snprintf(mutex_name_len, p->mutexName, "%s", mutex_name);
         p->id = iType;
         DosCreateMutexSem(p->mutexName, &p->mutex, 0, FALSE);
         DosOpenMutexSem(p->mutexName, &p->mutex);
@@ -106,9 +106,9 @@ sqlite3_mutex *sqlite3_mutex_alloc(int iType){
           DosExitCritSec();
           int i;
           for(i = 0; i < sizeof(staticMutexes)/sizeof(staticMutexes[0]); i++) {
-            staticMutexes[i].mutexName = (PSZ)malloc(MUTEX_NAME_LEN + 1);
-            sqlite3_snprintf(MUTEX_NAME_LEN + 1,
-                             staticMutexes[i].mutexName, "%s%1d", MUTEX_NAME, i);
+            staticMutexes[i].mutexName = (PSZ)malloc(mutex_name_len + 1);
+            sqlite3_snprintf(mutex_name_len + 1, /* one more for the number */
+                             staticMutexes[i].mutexName, "%s%1d", mutex_name, i);
             DosCreateMutexSem(staticMutexes[i].mutexName,
                               &staticMutexes[i].mutex, 0, FALSE);
             DosOpenMutexSem(staticMutexes[i].mutexName,