]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/back-shell/abandon.c
Update copyright statements
[openldap] / servers / slapd / back-shell / abandon.c
index 8bfb3c9a419e591ba119fb7bea846fd48dd5fa26..dd552a7174f3910f5fcbd7159c5377cabc5c87f6 100644 (file)
@@ -1,10 +1,15 @@
 /* abandon.c - shell backend abandon function */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
 #include <stdio.h>
-#include <signal.h>
 
+#include <ac/signal.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 
@@ -28,14 +33,14 @@ shell_back_abandon(
        if ( si->si_abandon == NULL ) {
                ldap_pvt_thread_mutex_lock( &conn->c_mutex );
                pid = -1;
-               for ( o = conn->c_ops; o != NULL; o = o->o_next ) {
+               LDAP_STAILQ_FOREACH( o, &conn->c_ops, o_next ) {
                        if ( o->o_msgid == msgid ) {
                                pid = (pid_t) o->o_private;
                                break;
                        }
                }
                if( pid == -1 ) {
-                       for ( o = conn->c_pending_ops; o != NULL; o = o->o_next ) {
+                       LDAP_STAILQ_FOREACH( o, &conn->c_pending_ops, o_next ) {
                                if ( o->o_msgid == msgid ) {
                                        pid = (pid_t) o->o_private;
                                        break;
@@ -45,8 +50,8 @@ shell_back_abandon(
                ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
 
                if ( pid != -1 ) {
-                       Debug( LDAP_DEBUG_ARGS, "shell killing pid %d\n", pid,
-                           0, 0 );
+                       Debug( LDAP_DEBUG_ARGS, "shell killing pid %d\n",
+                              (int) pid, 0, 0 );
                        kill( pid, SIGTERM );
                } else {
                        Debug( LDAP_DEBUG_ARGS, "shell could not find op %d\n",