earlybrowserreborn - Diff between revs 1 and 2

Subversion Repositories:
Rev:
Show entire file - Ignore whitespace
Rev 1 Rev 2
Line 2... Line 2...
2 2
3 #include "UiIncludes.h" 3 #include "UiIncludes.h"
4 -  
-   4 #include <stdarg.h>
-   5 #include <stdio.h>
5 6
6 static void uitimeouthandler(XtPointer data, XtIntervalId * id); 7 static void uitimeouthandler(XtPointer data, XtIntervalId * id);
7 static void uifdinputhandler(XtPointer data, int *fd, XtInputId * id); 8 static void uifdinputhandler(XtPointer data, int *fd, XtInputId * id);
8 static void uipopupcb(Widget wdg, char *address, 9 static void uipopupcb(Widget wdg, char *address,
9                        XmAnyCallbackStruct * calldata); 10                        XmAnyCallbackStruct * calldata);
Line 478... Line 479...
478                         XtWindow(uiTopLevel.ListGfx.FormWdg)); 479                         XtWindow(uiTopLevel.ListGfx.FormWdg));
479 } 480 }
480 481
481 482
482 ArgList 483 ArgList
483 uiVaSetArgs(nargs, va_alist) -  
484 int *nargs; -  
485 va_dcl -  
-   484 uiVaSetArgs(int *nargs, ...)
486 { 485 {
487     static Arg args[50]; 486     static Arg args[50];
488     String tmpstr; 487     String tmpstr;
489     va_list pvar; 488     va_list pvar;
490 489
491     *nargs = 0; 490     *nargs = 0;
492 491
493     va_start(pvar); -  
-   492     va_start(pvar,tmpstr);
494     tmpstr = va_arg(pvar, String); 493     tmpstr = va_arg(pvar, String);
495     while (tmpstr) { 494     while (tmpstr) {
496         XtSetArg(args[(int) *nargs], tmpstr, va_arg(pvar, XtArgVal)); 495         XtSetArg(args[(int) *nargs], tmpstr, va_arg(pvar, XtArgVal));
497         *nargs += 1; 496         *nargs += 1;
498         tmpstr = va_arg(pvar, String); 497         tmpstr = va_arg(pvar, String);
Line 508... Line 507...
508 Widget wdg; 507 Widget wdg;
509 String resource; 508 String resource;
510 { 509 {
511     Arg args[1]; 510     Arg args[1];
512 511
513     XtSetArg(args[0], resource, (XtArgVal) 0); -  
-   512     XtSetArg(args[0], resource, &args[0].value);
514     XtGetValues(wdg, args, 1); 513     XtGetValues(wdg, args, 1);
515 514
516     return args[0].value; 515     return args[0].value;
517 } 516 }
518 517