Changeset 751 for trunk/server/source3/lib/pthreadpool/pthreadpool.c

Timestamp:

Nov 29, 2012, 1:59:04 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.9

File:

• trunk/server/source3/lib/pthreadpool/pthreadpool.c (modified) (3 diffs)

trunk/server/source3/lib/pthreadpool/pthreadpool.c

@@ -288 +288 @@
  */
 
-int pthreadpool_finished_job(struct pthreadpool *pool)
-{
-        int result;
+int pthreadpool_finished_job(struct pthreadpool *pool, int *jobid)
+{
+        int ret_jobid;
         ssize_t nread;
 
@@ -297 +297 @@
 
         while ((nread == -1) && (errno == EINTR)) {
-                nread = read(pool->sig_pipe[0], &result, sizeof(int));
+                nread = read(pool->sig_pipe[0], &ret_jobid, sizeof(int));
         }
         if (nread == -1) {
@@ -305 +305 @@
                 return EINVAL;
         }
-        return result;
+        *jobid = ret_jobid;
+        return 0;
 }