/ Check-in [5e3dfa27]
Login
Overview
Comment:Fix typo in a Windows threading support routine.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | threads
Files: files | file ages | folders
SHA1:5e3dfa27c71a666e122e3cf64897038ff8424800
User & Date: mistachkin 2014-04-04 21:40:38
Context
2014-04-04
22:44
Fix harmless compiler warnings. check-in: e54dded2 user: drh tags: threads
21:40
Fix typo in a Windows threading support routine. check-in: 5e3dfa27 user: mistachkin tags: threads
18:37
Merge the latest trunk changes into the threads branch. check-in: 39ac79cf user: drh tags: threads
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/threads.c.

145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
/* Get the results of the thread */
int sqlite3ThreadJoin(SQLiteThread *p, void **ppOut){
  DWORD rc;

  assert( ppOut!=0 );
  if( p==0 ) return SQLITE_NOMEM;
  if( p->xTask==0 ){
    rc = WAIT_OBJECT_O;
  }else{
    rc = sqlite3Win32Wait((HANDLE)p->tid);
    assert( rc!=WAIT_IO_COMPLETION );
  }
  if( rc==WAIT_OBJECT_0 ) *ppOut = p->pResult;
  sqlite3_free(p);
  return (rc==WAIT_OBJECT_0) ? SQLITE_OK : SQLITE_ERROR;







|







145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
/* Get the results of the thread */
int sqlite3ThreadJoin(SQLiteThread *p, void **ppOut){
  DWORD rc;

  assert( ppOut!=0 );
  if( p==0 ) return SQLITE_NOMEM;
  if( p->xTask==0 ){
    rc = WAIT_OBJECT_0;
  }else{
    rc = sqlite3Win32Wait((HANDLE)p->tid);
    assert( rc!=WAIT_IO_COMPLETION );
  }
  if( rc==WAIT_OBJECT_0 ) *ppOut = p->pResult;
  sqlite3_free(p);
  return (rc==WAIT_OBJECT_0) ? SQLITE_OK : SQLITE_ERROR;