From: Florian G. <re...@us...> - 2006-10-31 22:01:51
|
Update of /cvsroot/perfparse/_perfparse/db_tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14557 Modified Files: perfparse-db-purge.c Log Message: #elseif -> #elif defined Index: perfparse-db-purge.c =================================================================== RCS file: /cvsroot/perfparse/_perfparse/db_tools/perfparse-db-purge.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** perfparse-db-purge.c 31 Oct 2006 15:28:36 -0000 1.3 --- perfparse-db-purge.c 31 Oct 2006 22:01:47 -0000 1.4 *************** *** 262,266 **** #ifdef USE_SOURCE_NAGIOS printf("| %-75s |\n", _("There are no Hosts, Services or Metrics marked for deletion today.")); ! #elseif USE_SOURCE_ASNMTAP printf("| %-75s |\n", _("There are no Plugins, Unique Key or Metrics marked for deletion today.")); #endif --- 262,266 ---- #ifdef USE_SOURCE_NAGIOS printf("| %-75s |\n", _("There are no Hosts, Services or Metrics marked for deletion today.")); ! #elif defined USE_SOURCE_ASNMTAP printf("| %-75s |\n", _("There are no Plugins, Unique Key or Metrics marked for deletion today.")); #endif *************** *** 276,280 **** #ifdef USE_SOURCE_NAGIOS printf("| %-75s |\n", _("Please ensure that NO data for these hosts will be added during deletion.")); ! #elseif USE_SOURCE_ASNMTAP printf("| %-75s |\n", _("Please ensure that NO data for these plugins will be added during deletion.")); #endif --- 276,280 ---- #ifdef USE_SOURCE_NAGIOS printf("| %-75s |\n", _("Please ensure that NO data for these hosts will be added during deletion.")); ! #elif defined USE_SOURCE_ASNMTAP printf("| %-75s |\n", _("Please ensure that NO data for these plugins will be added during deletion.")); #endif *************** *** 286,290 **** printf("| %-66s %08d |\n", _("Hosts marked for deletion:"), iCountHost); printf("| %-66s %08d |\n", _("Services marked for deletion:"), iCountService); ! #elseif USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Plugins marked for deletion:"), iCountHost); printf("| %-66s %08d |\n", _("Unique Keys marked for deletion:"), iCountService); --- 286,290 ---- printf("| %-66s %08d |\n", _("Hosts marked for deletion:"), iCountHost); printf("| %-66s %08d |\n", _("Services marked for deletion:"), iCountService); ! #elif defined USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Plugins marked for deletion:"), iCountHost); printf("| %-66s %08d |\n", _("Unique Keys marked for deletion:"), iCountService); *************** *** 314,318 **** #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Binary Summary Data, by Host deletion."), iRowsAffected); ! #elseif USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Binary Summary Data, by Plugin deletion."), iRowsAffected); #endif --- 314,318 ---- #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Binary Summary Data, by Host deletion."), iRowsAffected); ! #elif defined USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Binary Summary Data, by Plugin deletion."), iRowsAffected); #endif *************** *** 338,342 **** #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Binary Summary Data, by Service deletion."), iRowsAffected); ! #elseif USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Binary Summary Data, by Unique Key deletion."), iRowsAffected); #endif --- 338,342 ---- #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Binary Summary Data, by Service deletion."), iRowsAffected); ! #elif defined USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Binary Summary Data, by Unique Key deletion."), iRowsAffected); #endif *************** *** 380,384 **** #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Binary Summary Header, by Host deletion"), iRowsAffected); ! #elseif USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Binary Summary Header, by Plugin deletion"), iRowsAffected); #endif --- 380,384 ---- #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Binary Summary Header, by Host deletion"), iRowsAffected); ! #elif defined USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Binary Summary Header, by Plugin deletion"), iRowsAffected); #endif *************** *** 404,408 **** #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Binary Summary Header, by Service deletion"), iRowsAffected); ! #elseif USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Binary Summary Header, by Unique Key deletion"), iRowsAffected); #endif --- 404,408 ---- #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Binary Summary Header, by Service deletion"), iRowsAffected); ! #elif defined USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Binary Summary Header, by Unique Key deletion"), iRowsAffected); #endif *************** *** 449,453 **** #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Raw Summary Data, by Host deletion."), iRowsAffected); ! #elseif USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Raw Summary Data, by Plugin deletion."), iRowsAffected); #endif --- 449,453 ---- #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Raw Summary Data, by Host deletion."), iRowsAffected); ! #elif defined USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Raw Summary Data, by Plugin deletion."), iRowsAffected); #endif *************** *** 472,476 **** #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Raw Summary Data, by Service deletion."), iRowsAffected); ! #elseif USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Raw Summary Data, by Unique Key deletion."), iRowsAffected); #endif --- 472,476 ---- #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Raw Summary Data, by Service deletion."), iRowsAffected); ! #elif defined USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Raw Summary Data, by Unique Key deletion."), iRowsAffected); #endif *************** *** 497,501 **** #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Raw Summary Header, by Host deletion."), iRowsAffected); ! #elseif USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Raw Summary Header, by Plugin deletion."), iRowsAffected); #endif --- 497,501 ---- #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Raw Summary Header, by Host deletion."), iRowsAffected); ! #elif defined USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Raw Summary Header, by Plugin deletion."), iRowsAffected); #endif *************** *** 521,525 **** #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Raw Summary Header, by Service deletion."), iRowsAffected); ! #elseif USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Raw Summary Header, by Unique Key deletion."), iRowsAffected); #endif --- 521,525 ---- #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Raw Summary Header, by Service deletion."), iRowsAffected); ! #elif defined USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Raw Summary Header, by Unique Key deletion."), iRowsAffected); #endif *************** *** 548,552 **** #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Raw Data, by Host deletion."), iRowsAffected); ! #elseif USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Raw Data, by Plugin deletion."), iRowsAffected); #endif --- 548,552 ---- #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Raw Data, by Host deletion."), iRowsAffected); ! #elif defined USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Raw Data, by Plugin deletion."), iRowsAffected); #endif *************** *** 572,576 **** #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Raw Data, by Service deletion."), iRowsAffected); ! #elseif USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Raw Data, by Unique Key deletion."), iRowsAffected); #endif --- 572,576 ---- #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Raw Data, by Service deletion."), iRowsAffected); ! #elif defined USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Raw Data, by Unique Key deletion."), iRowsAffected); #endif *************** *** 598,602 **** #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Binary Data, by Host deletion."), iRowsAffected); ! #elseif USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Binary Data, by Plugin deletion."), iRowsAffected); #endif --- 598,602 ---- #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Binary Data, by Host deletion."), iRowsAffected); ! #elif defined USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Binary Data, by Plugin deletion."), iRowsAffected); #endif *************** *** 623,627 **** #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Binary Data, by Service deletion"), iRowsAffected); ! #elseif USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Binary Data, by Unique Keys deletion"), iRowsAffected); #endif --- 623,627 ---- #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Binary Data, by Service deletion"), iRowsAffected); ! #elif defined USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Binary Data, by Unique Keys deletion"), iRowsAffected); #endif *************** *** 670,674 **** #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Metrics, by Host deletion."), iRowsAffected); ! #elseif USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Metrics, by Plugin deletion."), iRowsAffected); #endif --- 670,674 ---- #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Metrics, by Host deletion."), iRowsAffected); ! #elif defined USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Metrics, by Plugin deletion."), iRowsAffected); #endif *************** *** 694,698 **** #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Metrics, by Service deletion."), iRowsAffected); ! #elseif USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Metrics, by Unique Key deletion."), iRowsAffected); #endif --- 694,698 ---- #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Metrics, by Service deletion."), iRowsAffected); ! #elif defined USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Metrics, by Unique Key deletion."), iRowsAffected); #endif *************** *** 735,739 **** #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Services, by Host deletion."), iRowsAffected); ! #elseif USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Unique Keys, by Plugin deletion."), iRowsAffected); #endif --- 735,739 ---- #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Services, by Host deletion."), iRowsAffected); ! #elif defined USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Unique Keys, by Plugin deletion."), iRowsAffected); #endif *************** *** 756,760 **** #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Services, by Service deletion."), iRowsAffected); ! #elseif USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Unique Keys, by Service deletion."), iRowsAffected); #endif --- 756,760 ---- #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Services, by Service deletion."), iRowsAffected); ! #elif defined USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Unique Keys, by Service deletion."), iRowsAffected); #endif *************** *** 779,783 **** #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Host, by Host deletion."), iRowsAffected); ! #elseif USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Plugin, by Plugin deletion."), iRowsAffected); #endif --- 779,783 ---- #ifdef USE_SOURCE_NAGIOS printf("| %-66s %08d |\n", _("Table: Host, by Host deletion."), iRowsAffected); ! #elif defined USE_SOURCE_ASNMTAP printf("| %-66s %08d |\n", _("Table: Plugin, by Plugin deletion."), iRowsAffected); #endif *************** *** 930,934 **** #ifdef USE_SOURCE_NAGIOS printf(_("| Service | Policy | Deleted |\n")); ! #elseif USE_SOURCE_ASNMTAP printf(_("| Unique Key | Policy | Deleted |\n")); #endif --- 930,934 ---- #ifdef USE_SOURCE_NAGIOS printf(_("| Service | Policy | Deleted |\n")); ! #elif defined USE_SOURCE_ASNMTAP printf(_("| Unique Key | Policy | Deleted |\n")); #endif *************** *** 989,991 **** } - --- 989,990 ---- |