upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-26 17:49:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#7182 Remove monitor_info_t from params for monitor_entry_stub.

Browse source
This commit is contained in:
Ondrej Kuznik 2012-04-12 09:44:21 +02:00 committed by Howard Chu
parent 838a7f5138
commit e8d913110d
15 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
servers/slapd/back-ldap/monitor.c
View file

@ -595,7 +595,7 @@ ldap_back_monitor_conn_init(
e = mbe->entry_stub( &ms->mss_dn, &ms->mss_ndn,
&ms->mss_rdn,
mi->mi_oc_monitorContainer, mi, NULL, NULL );
mi->mi_oc_monitorContainer, NULL, NULL );
if ( e == NULL ) {
Debug( LDAP_DEBUG_ANY,
"ldap_back_monitor_conn_init: "
@ -755,7 +755,7 @@ ldap_back_monitor_ops_init(
parent = mbe->entry_stub( &ms->mss_dn, &ms->mss_ndn,
&ms->mss_rdn,
mi->mi_oc_monitorContainer, mi, NULL, NULL );
mi->mi_oc_monitorContainer, NULL, NULL );
if ( parent == NULL ) {
Debug( LDAP_DEBUG_ANY,
"ldap_back_monitor_ops_init: "
@ -785,7 +785,7 @@ ldap_back_monitor_ops_init(
e = mbe->entry_stub( &parent->e_name, &parent->e_nname,
&ldap_back_monitor_op[op].rdn,
mi->mi_oc_monitorCounterObject, mi, NULL, NULL );
mi->mi_oc_monitorCounterObject, NULL, NULL );
if ( e == NULL ) {
Debug( LDAP_DEBUG_ANY,
"ldap_back_monitor_ops_init: "

1
servers/slapd/back-monitor/back-monitor.h
View file

@ -311,7 +311,6 @@ typedef struct monitor_extra_t {
struct berval *pndn,
struct berval *rdn,
ObjectClass *oc,
monitor_info_t *mi,
struct berval *create,
struct berval *modify );
monitor_entry_t * (*entrypriv_create)( void );

2
servers/slapd/back-monitor/backend.c
View file

@ -83,7 +83,7 @@ monitor_subsys_backend_init(
bv.bv_val = buf;
e = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn, &bv,
mi->mi_oc_monitoredObject, mi, NULL, NULL );
mi->mi_oc_monitoredObject, NULL, NULL );
if ( e == NULL ) {
Debug( LDAP_DEBUG_ANY,

8
servers/slapd/back-monitor/conn.c
View file

@ -77,7 +77,7 @@ monitor_subsys_conn_init(
*/
BER_BVSTR( &bv, "cn=Max File Descriptors" );
e = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn, &bv,
mi->mi_oc_monitorCounterObject, mi, NULL, NULL );
mi->mi_oc_monitorCounterObject, NULL, NULL );
if ( e == NULL ) {
Debug( LDAP_DEBUG_ANY,
@ -122,7 +122,7 @@ monitor_subsys_conn_init(
*/
BER_BVSTR( &bv, "cn=Total" );
e = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn, &bv,
mi->mi_oc_monitorCounterObject, mi, NULL, NULL );
mi->mi_oc_monitorCounterObject, NULL, NULL );
if ( e == NULL ) {
Debug( LDAP_DEBUG_ANY,
@ -161,7 +161,7 @@ monitor_subsys_conn_init(
*/
BER_BVSTR( &bv, "cn=Current" );
e = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn, &bv,
mi->mi_oc_monitorCounterObject, mi, NULL, NULL );
mi->mi_oc_monitorCounterObject, NULL, NULL );
if ( e == NULL ) {
Debug( LDAP_DEBUG_ANY,
@ -292,7 +292,7 @@ conn_create(
"cn=Connection %ld", c->c_connid );
bv.bv_val = buf;
e = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn, &bv,
mi->mi_oc_monitorConnection, mi, &ctmbv, &mtmbv );
mi->mi_oc_monitorConnection, &ctmbv, &mtmbv );
if ( e == NULL) {
Debug( LDAP_DEBUG_ANY,

4
servers/slapd/back-monitor/database.c
View file

@ -143,7 +143,7 @@ monitor_subsys_overlay_init_one(
bv.bv_val = buf;
e_overlay = monitor_entry_stub( &e_database->e_name, &e_database->e_nname, &bv,
mi->mi_oc_monitoredObject, mi, NULL, NULL );
mi->mi_oc_monitoredObject, NULL, NULL );
if ( e_overlay == NULL ) {
Debug( LDAP_DEBUG_ANY,
@ -222,7 +222,7 @@ monitor_subsys_database_init_one(
}
e = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn, rdn,
mi->mi_oc_monitoredObject, mi, NULL, NULL );
mi->mi_oc_monitoredObject, NULL, NULL );
if ( e == NULL ) {
Debug( LDAP_DEBUG_ANY,

4
servers/slapd/back-monitor/entry.c
View file

@ -174,11 +174,11 @@ monitor_entry_stub(
struct berval *pndn,
struct berval *rdn,
ObjectClass *oc,
monitor_info_t *mi,
struct berval *create,
struct berval *modify
)
{
monitor_info_t *mi;
AttributeDescription *nad = NULL;
Entry *e;
struct berval nat;
@ -186,6 +186,8 @@ monitor_entry_stub(
const char *text;
int rc;
mi = ( monitor_info_t * )be_monitor->be_private;
nat = *rdn;
ptr = strchr( nat.bv_val, '=' );
nat.bv_len = ptr - nat.bv_val;

4
servers/slapd/back-monitor/init.c
View file

@ -2286,7 +2286,7 @@ monitor_back_db_open(
/*
* creates the "cn=Monitor" entry
*/
e = monitor_entry_stub( NULL, NULL, &rdn, mi->mi_oc_monitorServer, mi,
e = monitor_entry_stub( NULL, NULL, &rdn, mi->mi_oc_monitorServer,
NULL, NULL );
if ( e == NULL) {
@ -2367,7 +2367,7 @@ monitor_back_db_open(
}
e = monitor_entry_stub( &root->e_name, &root->e_nname,
&monitor_subsys[ i ]->mss_rdn, mi->mi_oc_monitorContainer, mi,
&monitor_subsys[ i ]->mss_rdn, mi->mi_oc_monitorContainer,
NULL, NULL );
if ( e == NULL) {

2
servers/slapd/back-monitor/listener.c
View file

@ -75,7 +75,7 @@ monitor_subsys_listener_init(
"cn=Listener %d", i );
bv.bv_val = buf;
e = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn, &bv,
mi->mi_oc_monitoredObject, mi, NULL, NULL );
mi->mi_oc_monitoredObject, NULL, NULL );
if ( e == NULL ) {
Debug( LDAP_DEBUG_ANY,

2
servers/slapd/back-monitor/operation.c
View file

@ -102,7 +102,7 @@ monitor_subsys_ops_init(
* Initiated ops
*/
e = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn, &monitor_op[i].rdn,
mi->mi_oc_monitorOperation, mi, NULL, NULL );
mi->mi_oc_monitorOperation, NULL, NULL );
if ( e == NULL ) {
Debug( LDAP_DEBUG_ANY,

2
servers/slapd/back-monitor/overlay.c
View file

@ -78,7 +78,7 @@ monitor_subsys_overlay_init(
bv.bv_len = snprintf( buf, sizeof( buf ), "cn=Overlay %d", i );
bv.bv_val = buf;
e = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn, &bv,
mi->mi_oc_monitoredObject, mi, NULL, NULL );
mi->mi_oc_monitoredObject, NULL, NULL );
if ( e == NULL ) {
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_overlay_init: "

1
servers/slapd/back-monitor/proto-back-monitor.h
View file

@ -132,7 +132,6 @@ monitor_back_entry_stub LDAP_P((
struct berval *pndn,
struct berval *rdn,
ObjectClass *oc,
monitor_info_t *mi,
struct berval *create,
struct berval *modify ));

2
servers/slapd/back-monitor/rww.c
View file

@ -90,7 +90,7 @@ monitor_subsys_rww_init(
Entry *e;
e = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn, &monitor_rww[i].rdn,
mi->mi_oc_monitorCounterObject, mi, NULL, NULL );
mi->mi_oc_monitorCounterObject, NULL, NULL );
if ( e == NULL ) {
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_rww_init: "

2
servers/slapd/back-monitor/sent.c
View file

@ -94,7 +94,7 @@ monitor_subsys_sent_init(
e = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn,
&monitor_sent[i].rdn, mi->mi_oc_monitorCounterObject,
mi, NULL, NULL );
NULL, NULL );
if ( e == NULL ) {
Debug( LDAP_DEBUG_ANY,

2
servers/slapd/back-monitor/thread.c
View file

@ -139,7 +139,7 @@ monitor_subsys_thread_init(
*/
e = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn,
&mt[ i ].rdn,
mi->mi_oc_monitoredObject, mi, NULL, NULL );
mi->mi_oc_monitoredObject, NULL, NULL );
if ( e == NULL ) {
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_thread_init: "

6
servers/slapd/back-monitor/time.c
View file

@ -69,7 +69,7 @@ monitor_subsys_time_init(
BER_BVSTR( &bv, "cn=Start" );
e = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn, &bv,
mi->mi_oc_monitoredObject, mi, NULL, NULL );
mi->mi_oc_monitoredObject, NULL, NULL );
if ( e == NULL ) {
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_time_init: "
@ -105,7 +105,7 @@ monitor_subsys_time_init(
*/
BER_BVSTR( &bv, "cn=Current" );
e = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn, &bv,
mi->mi_oc_monitoredObject, mi, NULL, NULL );
mi->mi_oc_monitoredObject, NULL, NULL );
if ( e == NULL ) {
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_time_init: "
@ -141,7 +141,7 @@ monitor_subsys_time_init(
*/
BER_BVSTR( &bv, "cn=Uptime" );
e = monitor_entry_stub( &ms->mss_dn, &ms->mss_ndn, &bv,
mi->mi_oc_monitoredObject, mi, NULL, NULL );
mi->mi_oc_monitoredObject, NULL, NULL );
if ( e == NULL ) {
Debug( LDAP_DEBUG_ANY,
"monitor_subsys_time_init: "