1 --- IRRToolSet-4.7.3/src/aoe/TclApp.cc.orig Tue Apr 9 13:48:46 2002
2 +++ IRRToolSet-4.7.3/src/aoe/TclApp.cc Tue Jul 8 17:28:05 2003
6 TclApplication::TclApplication(char *pzcAppName, char *pzcDisplay,
7 - char *pzcDefaultResource = NULL,
8 - char *pzcResourceFile = NULL)
9 + char *pzcDefaultResource /* = NULL */,
10 + char *pzcResourceFile /* = NULL */)
12 pzcDisplay(pzcDisplay),
13 pzcDefaultResource(pzcDefaultResource),
18 -char *TclApplication::setVar(char *pzcName, char *pzcValue,
19 - int iFlags = TCL_GLOBAL_ONLY)
20 +const char *TclApplication::setVar(char *pzcName, char *pzcValue,
21 + int iFlags /* = TCL_GLOBAL_ONLY */)
23 SplitName cName(pzcName);
24 return Tcl_SetVar2(ptInterp, cName.name1(), cName.name2(),
28 -char *TclApplication::setVar(char *pzcName, int iValue,
29 - int iFlags = TCL_GLOBAL_ONLY)
30 +const char *TclApplication::setVar(char *pzcName, int iValue,
31 + int iFlags /* = TCL_GLOBAL_ONLY */)
33 SplitName cName(pzcName);
39 -char *TclApplication::getVar(char *pzcName, int iFlags = TCL_GLOBAL_ONLY)
40 +const char *TclApplication::getVar(char *pzcName, int iFlags /* = TCL_GLOBAL_ONLY */)
42 SplitName cName(pzcName);
43 return Tcl_GetVar2(ptInterp, cName.name1(), cName.name2(), iFlags);
44 --- IRRToolSet-4.7.3/src/aoe/TclEntry.hh.orig Tue Apr 9 13:48:46 2002
45 +++ IRRToolSet-4.7.3/src/aoe/TclEntry.hh Tue Jul 8 17:32:28 2003
47 return setValue(pzcValue);
49 int setValue(char *pzcValue);
50 - char *getValue(void);
51 + const char *getValue(void);
55 --- IRRToolSet-4.7.3/src/aoe/TclToggleButton.cc.orig Tue Apr 9 13:48:46 2002
56 +++ IRRToolSet-4.7.3/src/aoe/TclToggleButton.cc Tue Jul 8 17:34:55 2003
59 TclToggleButton::TclToggleButton(char *pzcName, char *pzcUnCheckString,
61 - tdCheckButtonOption eOption = cbUnCheck) :
62 + tdCheckButtonOption eOption /* = cbUnCheck */) :
63 TclCheckButton(pzcName, eOption)
65 this->pzcUnCheckString = strdup(pzcUnCheckString);
68 // Static member function
69 char *TclToggleButton::traceProc(ClientData pvData, Tcl_Interp *pcInterp,
70 - char *pzcName1, char *pzcName2, int iFlags)
71 + const char *pzcName1, const char *pzcName2, int iFlags)
73 TclToggleButton *pcToggleButton = (TclToggleButton *)pvData;
74 return pcToggleButton->traceProc();
75 --- IRRToolSet-4.7.3/src/aoe/TclToggleButton.hh.orig Tue Apr 9 13:48:46 2002
76 +++ IRRToolSet-4.7.3/src/aoe/TclToggleButton.hh Tue Jul 8 17:34:24 2003
79 int label(char *pzcLabel);
80 static char *traceProc(ClientData pvData, Tcl_Interp *pcInterp,
81 - char *pzcName1, char *pzcName2, int iFlags);
82 + const char *pzcName1, const char *pzcName2, int iFlags);
85 char *traceProc(void);
86 --- IRRToolSet-4.7.3/src/aoe/TclVar.cc.orig Tue Apr 9 13:48:46 2002
87 +++ IRRToolSet-4.7.3/src/aoe/TclVar.cc Tue Jul 8 17:35:46 2003
89 Tcl_SetVar2(pcApp->getInterp(), pzcName1, pzcName2, pzcValue, 0);
92 -char *TclVariable::getValue(char *pzcDummy = NULL)
93 +const char *TclVariable::getValue(char *pzcDummy /* = NULL */)
95 TclApplication *pcApp = (TclApplication *)getExtraArgument();
96 return Tcl_GetVar2(pcApp->getInterp(), pzcName1, pzcName2, 0);
99 int TclInt::getValue(void)
101 - char *pzcBuffer = TclVariable::getValue();
102 + const char *pzcBuffer = TclVariable::getValue();
103 return atoi(pzcBuffer);
105 --- IRRToolSet-4.7.3/src/aoe/TclApp.hh.orig Tue Apr 9 13:48:46 2002
106 +++ IRRToolSet-4.7.3/src/aoe/TclApp.hh Tue Jul 8 17:27:56 2003
108 char *getResourceFile(void) { return pzcResourceFile; }
109 void setResult(char *pzcResult) { ptInterp->result = pzcResult; }
110 const char *getResult(void) { return ptInterp->result; }
111 - char *setVar(char *pzcName, char *pzcValue,
112 + const char *setVar(char *pzcName, char *pzcValue,
113 int iFlags = TCL_GLOBAL_ONLY);
114 - char *setVar(char *pzcName, int iValue, int iFlags = TCL_GLOBAL_ONLY);
115 - char *getVar(char *pzcName, int iFlags = TCL_GLOBAL_ONLY);
116 + const char *setVar(char *pzcName, int iValue, int iFlags = TCL_GLOBAL_ONLY);
117 + const char *getVar(char *pzcName, int iFlags = TCL_GLOBAL_ONLY);
118 int createCommand(TclCommand *pcCommand);
119 int insert(TclObject *pcObject);
121 --- IRRToolSet-4.7.3/src/aoe/TclCmd.hh.orig Tue Apr 9 13:48:46 2002
122 +++ IRRToolSet-4.7.3/src/aoe/TclCmd.hh Tue Jul 8 17:31:47 2003
126 static int command(ClientData ptData, Tcl_Interp *ptInterp,
127 - int argc, char *argv[]);
128 + int argc, const char *argv[]);
129 static void cleanUp(ClientData ptData);
132 - virtual int command(int argc, char *argv[]) = 0;
133 + virtual int command(int argc, const char *argv[]) = 0;
134 virtual void cleanUp(void) { delete this; }
137 --- IRRToolSet-4.7.3/src/aoe/TclCheckButton.cc.orig Tue Apr 9 13:48:46 2002
138 +++ IRRToolSet-4.7.3/src/aoe/TclCheckButton.cc Tue Jul 8 17:30:14 2003
141 TclApplication *pcApp = (TclApplication *)getExtraArgument();
142 if (!pcApp) return -1;
144 + const char *pzcBuffer;
145 if ((pzcBuffer = pcApp->getVar(pzcVariableName)) == NULL) return -1;
146 return atoi(pzcBuffer);
148 --- IRRToolSet-4.7.3/src/aoe/TclCmd.cc.orig Tue Apr 9 13:48:46 2002
149 +++ IRRToolSet-4.7.3/src/aoe/TclCmd.cc Tue Jul 8 17:31:35 2003
153 int TclCommand::command(ClientData ptData, Tcl_Interp *ptInterp,
154 - int argc, char *argv[])
155 + int argc, const char *argv[])
157 TclCommand *pcTclCommand = (TclCommand *)ptData;
158 return(pcTclCommand->command(argc, argv));
159 --- IRRToolSet-4.7.3/src/aoe/TclEntry.cc.orig Tue Apr 9 13:48:46 2002
160 +++ IRRToolSet-4.7.3/src/aoe/TclEntry.cc Tue Jul 8 17:32:20 2003
165 -char *TclEntry::getValue(void)
166 +const char *TclEntry::getValue(void)
168 TclApplication *pcApp = (TclApplication *)getExtraArgument();
169 if (!pcApp) return NULL;
170 --- IRRToolSet-4.7.3/src/aoe/TclRadioButton.cc.orig Tue Apr 9 13:48:46 2002
171 +++ IRRToolSet-4.7.3/src/aoe/TclRadioButton.cc Tue Jul 8 17:32:47 2003
174 TclApplication *pcApp = (TclApplication *)getExtraArgument();
175 if (!pcApp) return -1;
177 + const char *pzcBuffer;
178 if ((pzcBuffer = pcApp->getVar(pzcVariableName)) == NULL) return -1;
179 return atoi(pzcBuffer);
181 --- IRRToolSet-4.7.3/src/aoe/TclVar.hh.orig Tue Apr 9 13:48:46 2002
182 +++ IRRToolSet-4.7.3/src/aoe/TclVar.hh Tue Jul 8 17:35:35 2003
185 virtual int setExtraArgument(void *pvExtraArgument);
186 void setValue(char *pzcValue);
187 - char *getValue(char *pzcDummy = NULL);
188 + const char *getValue(char *pzcDummy = NULL);
192 --- IRRToolSet-4.7.3/src/roe/roe_tcl.cc.orig Tue Apr 9 13:48:48 2002
193 +++ IRRToolSet-4.7.3/src/roe/roe_tcl.cc Tue Jul 8 17:05:13 2003
195 extern int irr_pending_replies;
197 int roe_statusbar_hint(ClientData clientData, Tcl_Interp *interp,
198 - int argc, char **argv) {
199 + int argc, const char **argv) {
201 Tcl_SetResult(interp, "wrong # of args", TCL_STATIC);
203 @@ -165,13 +165,13 @@
204 static int roe_routes_hint_index = -1;
206 int roe_routes_hint_reset(ClientData clientData, Tcl_Interp *interp,
207 - int argc, char **argv) {
208 + int argc, const char **argv) {
209 roe_routes_hint_index = -1;
213 int roe_routes_hint(ClientData clientData, Tcl_Interp *interp,
214 - int argc, char **argv) {
215 + int argc, const char **argv) {
217 Tcl_SetResult(interp, "wrong # of args", TCL_STATIC);
222 int roe_file_new_as(ClientData clientData, Tcl_Interp *interp,
223 - int argc, char **argv) {
224 + int argc, const char **argv) {
231 int roe_show_routes(ClientData clientData, Tcl_Interp *interp,
232 - int argc, char **argv) {
233 + int argc, const char **argv) {
235 Tcl_SetResult(interp, "wrong # of args", TCL_STATIC);
240 int roe_select_route(ClientData clientData, Tcl_Interp *interp,
241 - int argc, char **argv) {
242 + int argc, const char **argv) {
244 Tcl_SetResult(interp, "wrong # of args", TCL_STATIC);
249 int roe_show_object(ClientData clientData, Tcl_Interp *interp,
250 - int argc, char **argv) {
251 + int argc, const char **argv) {
254 Tcl_SetResult (interp, "wrong # of args", TCL_STATIC);
258 int roe_read_bgp_dump(ClientData clientData, Tcl_Interp *interp,
259 - int argc, char **argv) {
260 + int argc, const char **argv) {
263 Tcl_SetResult (interp, "wrong # of args", TCL_STATIC);
267 int roe_object_delete(ClientData clientData, Tcl_Interp *interp,
268 - int argc, char **argv) {
269 + int argc, const char **argv) {
272 Tcl_SetResult (interp, "wrong # of args", TCL_STATIC);
276 int roe_object_add(ClientData clientData, Tcl_Interp *interp,
277 - int argc, char **argv) {
278 + int argc, const char **argv) {
281 Tcl_SetResult (interp, "wrong # of args", TCL_STATIC);
285 int roe_object_update(ClientData clientData, Tcl_Interp *interp,
286 - int argc, char **argv) {
287 + int argc, const char **argv) {
290 Tcl_SetResult (interp, "wrong # of args", TCL_STATIC);
294 int roe_object_schedule(ClientData clientData, Tcl_Interp *interp,
295 - int argc, char **argv) {
296 + int argc, const char **argv) {
299 Tcl_SetResult (interp, "wrong # of args", TCL_STATIC);
303 int roe_select_transaction(ClientData clientData, Tcl_Interp *interp,
304 - int argc, char **argv) {
305 + int argc, const char **argv) {
308 Tcl_SetResult (interp, "wrong # of args", TCL_STATIC);
312 int roe_cancel_transaction(ClientData clientData, Tcl_Interp *interp,
313 - int argc, char **argv) {
314 + int argc, const char **argv) {
317 Tcl_SetResult (interp, "wrong # of args", TCL_STATIC);
321 int roe_add_selected(ClientData clientData, Tcl_Interp *interp,
322 - int argc, char **argv) {
323 + int argc, const char **argv) {
326 Tcl_SetResult (interp, "wrong # of args", TCL_STATIC);
330 int roe_del_selected(ClientData clientData, Tcl_Interp *interp,
331 - int argc, char **argv) {
332 + int argc, const char **argv) {
335 Tcl_SetResult (interp, "wrong # of args", TCL_STATIC);
339 int roe_del_selected_matching_source(ClientData clientData, Tcl_Interp *interp,
340 - int argc, char **argv) {
341 + int argc, const char **argv) {
344 Tcl_SetResult (interp, "wrong # of args", TCL_STATIC);
348 int roe_config_tmpl(ClientData clientData, Tcl_Interp *interp,
349 - int argc, char **argv) {
350 + int argc, const char **argv) {
353 Tcl_SetResult (interp, "wrong # of args", TCL_STATIC);
357 int roe_config_tmpl_apply(ClientData clientData, Tcl_Interp *interp,
358 - int argc, char **argv) {
359 + int argc, const char **argv) {
362 Tcl_SetResult (interp, "wrong # of args", TCL_STATIC);
366 int roe_config_irr(ClientData clientData, Tcl_Interp *interp,
367 - int argc, char **argv) {
368 + int argc, const char **argv) {
371 Tcl_SetResult (interp, "wrong # of args", TCL_STATIC);
375 int roe_config_irr_apply(ClientData clientData, Tcl_Interp *interp,
376 - int argc, char **argv) {
377 + int argc, const char **argv) {
380 Tcl_SetResult (interp, "wrong # of args", TCL_STATIC);
384 int roe_config_revert(ClientData clientData, Tcl_Interp *interp,
385 - int argc, char **argv) {
386 + int argc, const char **argv) {
389 Tcl_SetResult (interp, "wrong # of args", TCL_STATIC);
393 int roe_config_load(ClientData clientData, Tcl_Interp *interp,
394 - int argc, char **argv) {
395 + int argc, const char **argv) {
398 Tcl_SetResult (interp, "wrong # of args", TCL_STATIC);
402 int roe_config_save(ClientData clientData, Tcl_Interp *interp,
403 - int argc, char **argv) {
404 + int argc, const char **argv) {
407 Tcl_SetResult (interp, "wrong # of args", TCL_STATIC);
411 int roe_get_more_specifics(ClientData clientData, Tcl_Interp *interp,
412 - int argc, char **argv) {
413 + int argc, const char **argv) {
416 Tcl_SetResult (interp, "wrong # of args", TCL_STATIC);
420 int roe_get_less_specifics(ClientData clientData, Tcl_Interp *interp,
421 - int argc, char **argv) {
422 + int argc, const char **argv) {
425 Tcl_SetResult (interp, "wrong # of args", TCL_STATIC);
429 int roe_update_irr(ClientData clientData, Tcl_Interp *interp,
430 - int argc, char **argv) {
431 + int argc, const char **argv) {
434 Tcl_SetResult (interp, "wrong # of args", TCL_STATIC);
435 --- IRRToolSet-4.7.3/src/roe/object.hh.orig Tue Apr 9 13:48:48 2002
436 +++ IRRToolSet-4.7.3/src/roe/object.hh Tue Jul 8 17:07:33 2003
441 - void display(char *dbase, ASt as, char *rt);
442 + void display(const char *dbase, ASt as, const char *rt);
446 --- IRRToolSet-4.7.3/src/roe/route-list.hh.orig Tue Apr 9 13:48:48 2002
447 +++ IRRToolSet-4.7.3/src/roe/route-list.hh Tue Jul 8 17:11:06 2003
452 - void read_bgp_dump(char *fname);
453 - void get_more_specifics(char *selection);
454 - void get_less_specifics(char *selection);
455 + void read_bgp_dump(const char *fname);
456 + void get_more_specifics(const char *selection);
457 + void get_less_specifics(const char *selection);
459 Route *operator() (int index) {
460 return vrdisplayed[index];
461 --- IRRToolSet-4.7.3/src/roe/schedule.hh.orig Tue Apr 9 13:48:48 2002
462 +++ IRRToolSet-4.7.3/src/roe/schedule.hh Tue Jul 8 17:10:33 2003
465 void select(int index);
466 void cancel(int index);
467 - void add_selected(char *selection);
468 - void del_selected(char *selection);
469 - void del_selected_matching_source(char *selection, char *dbase);
470 + void add_selected(const char *selection);
471 + void del_selected(const char *selection);
472 + void del_selected_matching_source(const char *selection, const char *dbase);
475 void add_internal(char *text);
476 --- IRRToolSet-4.7.3/src/roe/object.cc.orig Tue Apr 9 13:48:48 2002
477 +++ IRRToolSet-4.7.3/src/roe/object.cc Tue Jul 8 17:13:24 2003
479 tcl_Eval(".object.text configure -state disabled");
482 -void RoeObject::display(char *dbase, ASt as, char *rt) {
483 +void RoeObject::display(const char *dbase, ASt as, const char *rt) {
486 tcl_Eval(".object.text configure -state normal");
488 whois->SetSources(dbase);
489 // Modified by wlee@isi.edu
490 // int code = whois->QueryResponse(buffer, "!mrt,%s-AS%d", rt, as);
491 - whois->getRoute(route, rt, as);
492 + whois->getRoute(route, (char*)rt, as);
496 --- IRRToolSet-4.7.3/src/roe/route-list.cc.orig Tue Jun 18 13:00:11 2002
497 +++ IRRToolSet-4.7.3/src/roe/route-list.cc Tue Jul 8 17:14:50 2003
499 get_registrations_init(rlist.head());
502 -void RouteList::read_bgp_dump(char *fname) {
503 +void RouteList::read_bgp_dump(const char *fname) {
511 -void RouteList::get_more_specifics(char *selection) {
512 +void RouteList::get_more_specifics(const char *selection) {
513 RouteList::Route *vr;
520 - for (char *s = strtok(selection, " \t"); s; s = strtok(NULL, " \t")) {
521 + for (char *s = strtok((char*)selection, " \t"); s; s = strtok(NULL, " \t")) {
522 vr = vrdisplayed[atoi(s)];
523 RadixNode *rdnode = irr_radix->find(&vr->route);
526 get_more_specifics_add(rdnode->rght);
529 -void RouteList::get_less_specifics(char *selection) {
530 +void RouteList::get_less_specifics(const char *selection) {
531 RouteList::Route *vr;
538 - for (char *s = strtok(selection, " \t"); s; s = strtok(NULL, " \t")) {
539 + for (char *s = strtok((char*)selection, " \t"); s; s = strtok(NULL, " \t")) {
540 vr = vrdisplayed[atoi(s)];
541 irr_node = irr_radix->find(&vr->route);
542 node = radix.find(&vr->route);
543 --- IRRToolSet-4.7.3/src/roe/schedule.cc.orig Tue Apr 9 13:48:48 2002
544 +++ IRRToolSet-4.7.3/src/roe/schedule.cc Tue Jul 8 17:15:43 2003
545 @@ -170,11 +170,11 @@
546 tcl_Eval(".object.text configure -state disabled");
549 -void Schedule::add_selected(char *selection) {
550 +void Schedule::add_selected(const char *selection) {
554 - for (char *s = strtok(selection, " \t"); s; s = strtok(NULL, " \t")) {
555 + for (char *s = strtok((char*)selection, " \t"); s; s = strtok(NULL, " \t")) {
556 r = routelist(atoi(s));
558 tcl_Eval("set AS AS%d", routelist.as);
559 @@ -186,12 +186,12 @@
563 -void Schedule::del_selected(char *selection) {
564 +void Schedule::del_selected(const char *selection) {
566 RouteList::Route::db_as *p;
569 - for (char *s = strtok(selection, " \t"); s; s = strtok(NULL, " \t")) {
570 + for (char *s = strtok((char*)selection, " \t"); s; s = strtok(NULL, " \t")) {
571 r = routelist(atoi(s));
572 for (p = r->db_as_l.head(); p; p = r->db_as_l.next(p)) {
573 // Modified by wlee@isi.edu
574 @@ -227,12 +227,12 @@
578 -void Schedule::del_selected_matching_source(char *selection, char *dbase) {
579 +void Schedule::del_selected_matching_source(const char *selection, const char *dbase) {
581 RouteList::Route::db_as *p;
584 - for (char *s = strtok(selection, " \t"); s; s = strtok(NULL, " \t")) {
585 + for (char *s = strtok((char*)selection, " \t"); s; s = strtok(NULL, " \t")) {
586 r = routelist(atoi(s));
587 for (p = r->db_as_l.head(); p; p = r->db_as_l.next(p)) {
588 if (!strcmp(dbase, p->db)) {
589 --- IRRToolSet-4.7.3/src/roe/roe_config.cc.orig Tue Apr 9 13:48:48 2002
590 +++ IRRToolSet-4.7.3/src/roe/roe_config.cc Tue Jul 8 17:17:16 2003
591 @@ -182,12 +182,11 @@
594 void Configure::config_tmpl() {
596 -if {[winfo exists .config_tmpl]} {
597 - wm deiconify .config_tmpl
602 +"if {[winfo exists .config_tmpl]} {\n"
603 +" wm deiconify .config_tmpl\n"
605 +"} else {set a 0} \n");
607 if (*(interp->result) != '0') // already displaying a config window
609 @@ -218,12 +217,11 @@
612 void Configure::config_irr() {
614 -if {[winfo exists .config_irr]} {
615 - wm deiconify .config_irr
620 +"if {[winfo exists .config_irr]} {\n"
621 +" wm deiconify .config_irr\n"
623 +"} else {set a 0} \n");
625 if (*(interp->result) != '0') // already displaying a config window
627 @@ -236,11 +234,11 @@
630 for (int i = 0; *dbupdate[i].source; ++i)
631 - tcl_Eval("label .config_irr.source.label.x%s -text %s:
632 -entry .config_irr.source.entry.x%s -relief sunken -bd 2 -width 30
633 -pack .config_irr.source.label.x%s -side top -anchor e -ipady 3 -expand true
634 -pack .config_irr.source.entry.x%s -side top -fill both -expand 1 -pady 1 -padx 1
635 -.config_irr.source.entry.x%s insert 0 {%s}",
636 + tcl_Eval("label .config_irr.source.label.x%s -text %s:\n"
637 +"entry .config_irr.source.entry.x%s -relief sunken -bd 2 -width 30\n"
638 +"pack .config_irr.source.label.x%s -side top -anchor e -ipady 3 -expand true\n"
639 +"pack .config_irr.source.entry.x%s -side top -fill both -expand 1 -pady 1 -padx 1\n"
640 +".config_irr.source.entry.x%s insert 0 {%s}",
641 dbupdate[i].source, dbupdate[i].source, dbupdate[i].source,
642 dbupdate[i].source, dbupdate[i].source, dbupdate[i].source,
644 --- IRRToolSet-4.7.3/src/aoe/aoe.hh.orig Tue Apr 9 13:48:46 2002
645 +++ IRRToolSet-4.7.3/src/aoe/aoe.hh Wed Jul 9 09:54:31 2003
647 class ListPeer : public TclCommand
650 - virtual int command(int argc, char *argv[]);
651 + virtual int command(int argc, const char *argv[]);
654 int updateWindowTitle(TclApplication *pcApp, int iCategory,
656 class LoadBgpDump : public TclCommand
659 - virtual int command(int argc, char *argv[]);
660 + virtual int command(int argc, const char *argv[]);
663 LoadBgpDump(char *pzcName) : TclCommand(pzcName) {}
665 class UpdatePolicy : public TclCommand
668 - virtual int command(int argc, char *argv[]);
669 + virtual int command(int argc, const char *argv[]);
674 class EditPolicyText : public TclCommand
677 - virtual int command(int argc, char *argv[]);
678 + virtual int command(int argc, const char *argv[]);
681 EditPolicyText(char *pzcName) : TclCommand(pzcName) {}
683 class ShowPolicyText : public TclCommand
686 - virtual int command(int argc, char *argv[]);
687 + virtual int command(int argc, const char *argv[]);
690 ShowPolicyText(char *pzcName) : TclCommand(pzcName) {}
692 class FileOpen : public TclCommand
695 - virtual int command(int argc, char *argv[]);
696 + virtual int command(int argc, const char *argv[]);
699 FileOpen(char *pzcName) : TclCommand(pzcName) {}
701 class FileSave : public TclCommand
704 - virtual int command(int argc, char *argv[]);
705 + virtual int command(int argc, const char *argv[]);
708 FileSave(char *pzcName) : TclCommand(pzcName) {}
710 class ListSave : public TclCommand // katie@ripe.net for peers save
713 - virtual int command(int argc, char *argv[]);
714 + virtual int command(int argc, const char *argv[]);
717 ListSave(char *pzcName) : TclCommand(pzcName) {}
719 class FileRevert : public TclCommand
722 - virtual int command(int argc, char *argv[]);
723 + virtual int command(int argc, const char *argv[]);
726 FileRevert(char *pzcName) : TclCommand(pzcName) {}
728 class FilePrint : public TclCommand
731 - virtual int command(int argc, char *argv[]);
732 + virtual int command(int argc, const char *argv[]);
735 FilePrint(char *pzcName) : TclCommand(pzcName) {}
737 class AddPeer : public TclCommand
740 - virtual int command(int argc, char *argv[]);
741 + virtual int command(int argc, const char *argv[]);
744 AddPeer(char *pzcName) : TclCommand(pzcName) {}
746 class DeletePeer: public TclCommand
749 - virtual int command(int argc, char *argv[]);
750 + virtual int command(int argc, const char *argv[]);
753 DeletePeer(char *pzcName) : TclCommand(pzcName) {}
755 class CreatePolicyTemplateMenu : public TclCommand
758 - virtual int command(int argc, char *argv[]);
759 + virtual int command(int argc, const char *argv[]);
762 CreatePolicyTemplateMenu(char *pzcName) : TclCommand(pzcName) {}
763 --- IRRToolSet-4.7.3/src/aoe/aoe.cc.orig Tue Apr 9 13:48:46 2002
764 +++ IRRToolSet-4.7.3/src/aoe/aoe.cc Wed Jul 9 09:56:04 2003
766 int ListPeer::updateWindowTitle(TclApplication *pcTcl, int iCategory,
769 - char *title, *dummy = "Shouldn't happen!";
770 + const char *title, *dummy = "Shouldn't happen!";
772 AoeApplication *pcApp = (AoeApplication *)pcTcl;
776 sprintf(pzcBuffer, "PolicyTemplate(%d,import)", iCategory - 4);
778 - << substitute(pcApp->getVar(pzcBuffer), pzcMyAS, pzcPeerAS)
779 + << substitute((char*)pcApp->getVar(pzcBuffer), pzcMyAS, pzcPeerAS)
785 sprintf(pzcBuffer, "PolicyTemplate(%d,export)", iCategory - 4);
787 - << substitute(pcApp->getVar(pzcBuffer), pzcMyAS, pzcPeerAS)
788 + << substitute((char*)pcApp->getVar(pzcBuffer), pzcMyAS, pzcPeerAS)
791 // Fill the text widget
796 -int ListPeer::command(int argc, char *argv[])
797 +int ListPeer::command(int argc, const char *argv[])
799 if (argc != 2) return TCL_ERROR;
800 AoeApplication *pcApp = (AoeApplication *)getExtraArgument();
805 -int LoadBgpDump::command(int argc, char *argv[])
806 +int LoadBgpDump::command(int argc, const char *argv[])
808 if (argc != 2) return TCL_ERROR;
809 AoeApplication *pcApp = (AoeApplication *)getExtraArgument();
810 @@ -748,10 +748,10 @@
814 -int UpdatePolicy::command(int argc, char *argv[])
815 +int UpdatePolicy::command(int argc, const char *argv[])
817 if (argc != 3) return TCL_ERROR;
818 - char *pzcOption = argv[1];
819 + const char *pzcOption = argv[1];
820 int iTarget = atoi(argv[2]);
821 int iResult = TCL_ERROR;
822 if (strcmp(pzcOption, "append") == 0)
827 -int EditPolicyText::command(int argc, char *argv[])
828 +int EditPolicyText::command(int argc, const char *argv[])
830 if (argc != 1) return TCL_ERROR;
831 AoeApplication *pcApp = (AoeApplication *)getExtraArgument();
836 -int ShowPolicyText::command(int argc, char *argv[])
837 +int ShowPolicyText::command(int argc, const char *argv[])
839 if (argc != 1) return TCL_ERROR;
840 AoeApplication *pcApp = (AoeApplication *)getExtraArgument();
845 -int FileOpen::command(int argc, char *argv[])
846 +int FileOpen::command(int argc, const char *argv[])
848 if (argc != 2) return TCL_ERROR;
849 AoeApplication *pcApp = (AoeApplication *)getExtraArgument();
854 -int FileSave::command(int argc, char *argv[])
855 +int FileSave::command(int argc, const char *argv[])
857 if (argc != 2) return TCL_ERROR;
858 AoeApplication *pcApp = (AoeApplication *)getExtraArgument();
862 // by katie@ripe.net for saving the peer list with status
863 -int ListSave::command(int argc, char *argv[])
864 +int ListSave::command(int argc, const char *argv[])
866 if (argc != 2) return TCL_ERROR;
867 AoeApplication *pcApp = (AoeApplication *)getExtraArgument();
872 -int FileRevert::command(int argc, char *argv[])
873 +int FileRevert::command(int argc, const char *argv[])
875 if (argc != 1) return TCL_ERROR;
876 AoeApplication *pcApp = (AoeApplication *)getExtraArgument();
877 @@ -945,10 +945,10 @@
881 -int FilePrint::command(int argc, char *argv[])
882 +int FilePrint::command(int argc, const char *argv[])
884 if (argc != 2) return TCL_ERROR;
885 - char *pzcCommand = argv[1];
886 + const char *pzcCommand = argv[1];
887 AoeApplication *pcApp = (AoeApplication *)getExtraArgument();
894 -int AddPeer::command(int argc, char *argv[])
895 +int AddPeer::command(int argc, const char *argv[])
897 if (argc != 2) return TCL_ERROR;
898 AoeApplication *pcApp = (AoeApplication *)getExtraArgument();
903 -int DeletePeer::command(int argc, char *argv[])
904 +int DeletePeer::command(int argc, const char *argv[])
906 if (argc != 2) return TCL_ERROR;
907 AoeApplication *pcApp = (AoeApplication *)getExtraArgument();
908 @@ -1041,7 +1041,7 @@
912 -int CreatePolicyTemplateMenu::command(int argc, char *argv[])
913 +int CreatePolicyTemplateMenu::command(int argc, const char *argv[])
915 if (argc != 1) return TCL_ERROR;
916 AoeApplication *pcApp = (AoeApplication *)getExtraArgument();
917 @@ -1049,14 +1049,14 @@
918 for (int i = pcApp->pcCategoryButton->getSize(); i > 4; i--)
919 pcApp->pcCategoryButton->del(i);
921 - char *pzcTotal = pcApp->getVar("PolicyTemplate(Total)");
922 + const char *pzcTotal = pcApp->getVar("PolicyTemplate(Total)");
925 for (int i = 0; i < atoi(pzcTotal); i++)
928 sprintf(pzcBuffer, "PolicyTemplate(%d,Description)", i);
929 - if (!pcApp->pcCategoryButton->add(pcApp->getVar(pzcBuffer),
930 + if (!pcApp->pcCategoryButton->add((char*)pcApp->getVar(pzcBuffer),
931 "listPeer [.body.aspeer.listbox.list curselection]"))