[Xcircuit-dev] de-linting patch for CVS

ldoolitt at recycle.lbl.gov ldoolitt at recycle.lbl.gov
Thu Jun 1 09:51:38 PDT 2006 

Friends -

I have worked on enough different computers and compilers that
I am allergic to certain forms of C lint.  This patch applies
to today's xcircuit CVS (which I think is effectively the same
as 3.6.26).

C language usage cleanup:
 * actually use prototypes (almost) everywhere
 * don't use implicit int
 * return a value when we're supposed to
 * keep /* and */ nested properly
 * use %hd to sprintf a short
No changes to functionality are intended or expected.

This patch does not include Steve Langasek's correction to
Xw/XwP.h, please apply that patch separately.

After some or all of this relatively long but simple patch
is applied, I will dig into some of the trickier bits.
If the e-mail system mangles the patch, you can fetch a
fresh copy from
  http://recycle.lbl.gov/~ldoolitt/xcircuit-patch-20060601.txt

    - Larry


diff --exclude=configure -u /home/ldoolitt/cvs/xcircuit-3.6/events.c xcircuit-3.6-cvs/events.c
--- /home/ldoolitt/cvs/xcircuit-3.6/events.c	2006-05-02 14:26:19.000000000 -0700
+++ xcircuit-3.6-cvs/events.c	2006-06-01 09:30:40.000000000 -0700
@@ -1286,7 +1286,7 @@
    }
 }
 
-void poly_edit_op(op)
+void poly_edit_op(int op)
 {
    genericptr *keygen = EDITPART;
    polyptr lwire, *newpoly;
diff --exclude=configure -u /home/ldoolitt/cvs/xcircuit-3.6/files.c xcircuit-3.6-cvs/files.c
--- /home/ldoolitt/cvs/xcircuit-3.6/files.c	2006-05-30 11:54:02.000000000 -0700
+++ xcircuit-3.6-cvs/files.c	2006-06-01 09:30:40.000000000 -0700
@@ -1297,7 +1297,7 @@
 
 /*---------------------------------------------------------*/
 
-void startloadfile(libnum)
+void startloadfile(int libnum)
 {
    short firstpage = areawin->page;
 
@@ -5023,7 +5023,7 @@
    pointlist savept;
    short stcount;
    short segs;
-   Boolean has_param;
+   Boolean has_parameter;
    char *fptr;
 
    /* first, get a total count of all objects and give warning if large */
@@ -5247,9 +5247,9 @@
 	    if (TOLABEL(savegen)->string->type != FONT_NAME) break;
 
 	    /* Check for parameter --- must use "mark" to count # segments */
-	    has_param = hasparameter(TOLABEL(savegen));
+	    has_parameter = hasparameter(TOLABEL(savegen));
 
-	    if (has_param) {
+	    if (has_parameter) {
 	       fprintf(ps, "mark ");
 	       stcount += 5;
 	    }
@@ -5257,7 +5257,7 @@
 	    segs = writelabel(ps, TOLABEL(savegen)->string, &stcount);
 
 	    if (segs > 0) {
-	       if (has_param)
+	       if (has_parameter)
                   sprintf(_STR, "ctmk ");
 	       else
                   sprintf(_STR, "%hd ", segs);
diff --exclude=configure -u /home/ldoolitt/cvs/xcircuit-3.6/libraries.c xcircuit-3.6-cvs/libraries.c
--- /home/ldoolitt/cvs/xcircuit-3.6/libraries.c	2006-04-10 14:52:19.000000000 -0700
+++ xcircuit-3.6-cvs/libraries.c	2006-06-01 09:30:40.000000000 -0700
@@ -186,7 +186,7 @@
    int i;
    short *counts, *icount, *result;
 
-   if (xobjs.pagelist[page]->pageinst == NULL) return;
+   if (xobjs.pagelist[page]->pageinst == NULL) return NULL;
 
    counts = (short *)malloc(xobjs.pages * sizeof(short));
    icount = (short *)malloc(xobjs.pages * sizeof(short));
@@ -1219,7 +1219,7 @@
 /* in that library has changed.				*/
 /*------------------------------------------------------*/
 
-void lib_set_changes(libnum)
+void lib_set_changes(int libnum)
 {
    int j;
    objectptr thisobj;
diff --exclude=configure -u /home/ldoolitt/cvs/xcircuit-3.6/menucalls.c xcircuit-3.6-cvs/menucalls.c
--- /home/ldoolitt/cvs/xcircuit-3.6/menucalls.c	2006-04-10 14:52:19.000000000 -0700
+++ xcircuit-3.6-cvs/menucalls.c	2006-06-01 09:30:40.000000000 -0700
@@ -321,6 +321,7 @@
 /* Set the output page size, in the current unit of measure	*/
 /* Return value:  TRUE if _STR2 values were in inches, FALSE	*/
 /* if in centimeters.						*/
+/* XXX This API gives no good way to signal errors.             */
 /*--------------------------------------------------------------*/
 
 Boolean setoutputpagesize(XPoint *dataptr)
@@ -337,14 +338,14 @@
       if (sscanf(_STR2, "%f %*c %f", &px, &py) < 3) {
 	 if ((expos = strchr(_STR2, 'x')) == NULL) {
             Wprintf("Illegal Form for page size.");
-	    return;
+	    return FALSE;
 	 }
 	 else {
 	    *expos = '\0';
 	    if (sscanf(_STR2, "%f", &px) == 0 ||
 		  sscanf(expos + 1, "%f %9s", &py, units) == 0) {
                Wprintf("Illegal Form for page size.");
-	       return;
+	       return FALSE;
 	    }
 	 }
       }
@@ -355,7 +356,7 @@
 
    if ((px <= 2.0) || (py <= 2.0)) {
       Wprintf("Page size too small for margins.");
-      return;
+      return FALSE;
    }
 
    dataptr->x = (short)(px * 72.0);
diff --exclude=configure -u /home/ldoolitt/cvs/xcircuit-3.6/ngspice.c xcircuit-3.6-cvs/ngspice.c
--- /home/ldoolitt/cvs/xcircuit-3.6/ngspice.c	2006-04-10 14:52:19.000000000 -0700
+++ xcircuit-3.6-cvs/ngspice.c	2006-06-01 09:30:40.000000000 -0700
@@ -17,6 +17,7 @@
 #ifndef _MSC_VER
 #include <sys/wait.h>   /* for waitpid() */
 #include <sys/time.h>
+#include <ctype.h>
 #endif
 #include <sys/types.h>
 #include <signal.h>
@@ -355,7 +356,7 @@
 #ifdef _MSC_VER
    if (spiceproc == INVALID_HANDLE_VALUE) return 0;	 /* No process to interrupt */
 #else
-   if (spiceproc == -1) return;	 /* No process to interrupt */
+   if (spiceproc == -1) return 0;	 /* No process to interrupt */
 #endif
 
    /* Sending SIGINT in any state other than "busy" will kill	*/
diff --exclude=configure -u /home/ldoolitt/cvs/xcircuit-3.6/opengl.c xcircuit-3.6-cvs/opengl.c
--- /home/ldoolitt/cvs/xcircuit-3.6/opengl.c	2006-04-10 14:52:19.000000000 -0700
+++ xcircuit-3.6-cvs/opengl.c	2006-06-01 09:30:40.000000000 -0700
@@ -120,7 +120,7 @@
 }
 
 /*------------------------------------------------------*/
-/* Set line attributes
+/* Set line attributes                                  */
 /*------------------------------------------------------*/
 
 void
diff --exclude=configure -u /home/ldoolitt/cvs/xcircuit-3.6/prototypes.h xcircuit-3.6-cvs/prototypes.h
--- /home/ldoolitt/cvs/xcircuit-3.6/prototypes.h	2006-04-10 14:52:19.000000000 -0700
+++ xcircuit-3.6-cvs/prototypes.h	2006-06-01 09:45:48.000000000 -0700
@@ -7,11 +7,11 @@
 
 /* Note variable argument list for register_for_undo() */
 extern void register_for_undo(u_int, u_char, objinstptr, ...);
-extern void undo_action();
-extern void redo_action();
-extern void flush_undo_stack();
-extern void flush_redo_stack();
-extern void truncate_undo_stack();
+extern void undo_action(void);
+extern void redo_action(void);
+extern void flush_undo_stack(void);
+extern void flush_redo_stack(void);
+extern void truncate_undo_stack(void);
 extern void free_undo_record(Undoptr);
 extern void free_redo_record(Undoptr);
 extern stringpart *get_original_string(labelptr);
@@ -31,6 +31,8 @@
 extern Tk_EventProc *xctk_drag(ClientData, XEvent *);
 extern Tk_EventProc *xctk_draglscroll(ClientData, XEvent *);
 extern Tk_EventProc *xctk_dragfilebox(ClientData, XEvent *);
+extern void tcl_stdflush(FILE *);
+extern void tcl_printf(FILE *, const char *, ...);
 extern int XcTagCallback(Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
 extern Tcl_Obj *evaluate_raw(oparamptr, int *);
 extern char *TCL_to_PS(char *);
@@ -86,17 +88,17 @@
 extern void textbutton(u_char, int, int);
 extern void charreport(labelptr);
 extern Boolean labeltext(int, char *);
-extern void textreturn();
+extern void textreturn(void);
 extern void rejustify(short);
 extern void finddir(polyptr);
 extern void reversepoints(XPoint *, short);
 extern void reversefpoints(XfPoint *, short);
 extern void freeparts(short *, short);
 extern void removep(short *, short);
-extern void unjoin();
+extern void unjoin(void);
 extern labelptr findlabelcopy(labelptr, stringpart *);
 extern Boolean neartest(XPoint *, XPoint *);
-extern void join();
+extern void join(void);
 
 /* interactive manipulation of elements */
 extern void splinebutton(int, int);
@@ -114,9 +116,9 @@
 /* from events.c: */
 
 extern Boolean recursefind(objectptr, objectptr);
-extern void transferselects();
-extern void select_invalidate_netlist();
-extern void newmatrix();
+extern void transferselects(void);
+extern void select_invalidate_netlist(void);
+extern void newmatrix(void);
 extern void setpage(Boolean);
 extern int changepage(short);
 extern void newpage(short);
@@ -142,7 +144,7 @@
 extern void panrefresh(u_int, int, int, float);
 extern void checkwarp(XPoint *);
 extern int checkcycle(short, short);
-extern void copyvirtual();
+extern void copyvirtual(void);
 extern void nextpolycycle(polyptr, short);
 extern void nextsplinecycle(splineptr, short);
 extern void nextarccycle(arcptr, short);
@@ -153,7 +155,7 @@
 extern int functiondispatch(int, short, int, int);
 extern void releasehandler(xcWidget, caddr_t, XKeyEvent *);
 extern void setsnap(short);
-extern void snapelement();
+extern void snapelement(void);
 extern int ipow10(int);
 extern int calcgcf(int, int);
 extern void fraccalc(float, char *);
@@ -170,7 +172,7 @@
 extern void pathedit(genericptr *, short);
 extern void xc_lower(short *);
 extern void xc_raise(short *);
-extern void exchange();
+extern void exchange(void);
 extern void elhflip(genericptr *, short);
 extern void elvflip(genericptr *, short);
 extern void elementflip(XPoint *);
@@ -182,12 +184,13 @@
 #endif
 extern void reviseselect(short *, int, short *);
 extern void deletebutton(int, int);
+extern void delete_one_element(objinstptr, genericptr);
 extern short *xc_undelete(objinstptr, objectptr, short, short *);
 extern objectptr delete_element(objinstptr, short *, int, short);
 extern void printname(objectptr);
 extern Boolean checkname(objectptr);
 extern char *checkpostscriptname(char *, int *, objectptr);
-extern objectptr finddot();
+extern objectptr finddot(void);
 extern void movepoints(genericptr *, short, short);
 #ifndef TCL_WRAPPER
 extern void xlib_makeobject(xcWidget, caddr_t);
@@ -203,6 +206,9 @@
 extern void polycopy(polyptr, polyptr);
 extern void splinecopy(splineptr, splineptr);
 extern void instcopy(objinstptr, objinstptr);
+extern void delete_tagged(objectptr);
+extern void createcopies(void);
+extern void copydrag(void);
 extern void copy_op(int, int, int);
 extern Boolean checkmultiple(XButtonEvent *);
 extern void continue_op(int, int, int);
@@ -220,9 +226,9 @@
 extern void dragfilebox(xcWidget, caddr_t, XMotionEvent *);
 extern void startfiletrack(xcWidget, caddr_t, XCrossingEvent *);
 extern void endfiletrack(xcWidget, caddr_t, XCrossingEvent *);
-extern char *getcrashfilename();
-extern void crashrecover();
-extern void findcrashfiles();
+extern char *getcrashfilename(void);
+extern void crashrecover(void);
+extern void findcrashfiles(void);
 extern void listfiles(xcWidget, popupstruct *, caddr_t);
 extern void newfilelist(xcWidget, popupstruct *);
 extern void fileselect(xcWidget, popupstruct *, XButtonEvent *);
@@ -234,7 +240,7 @@
 /* from files.c: */
 
 #ifdef ASG
-extern void importspice();
+extern void importspice(void);
 #endif
 
 extern char *ridnewline(char *);
@@ -254,17 +260,17 @@
 extern void varfcheck(FILE *, float, objectptr, short *, genericptr, u_char);
 extern void varpcheck(FILE *, short, objectptr, int, short *, genericptr, u_char);
 extern void getfile(xcWidget, pointertype, caddr_t);
-extern Boolean nextfilename();
-extern void loadfontlib();
+extern Boolean nextfilename(void);
+extern void loadfontlib(void);
 extern void loadglib(Boolean, short, short);
-extern void loadulib();
-extern void loadblib();
+extern void loadulib(void);
+extern void loadblib(void);
 extern void getlib(xcWidget, caddr_t, caddr_t);
 extern void getuserlib(xcWidget, caddr_t, caddr_t);
 extern Boolean loadlibrary(short);
 extern void startloadfile(int);
-extern void normalloadfile();
-extern void importfile();
+extern void normalloadfile(void);
+extern void importfile(void);
 extern Boolean loadfile(short, int);
 extern void readlabel(objectptr, char *, stringpart **);
 extern void readparams(objectptr, objinstptr, objectptr, char *);
@@ -289,6 +295,7 @@
 extern void setfile(xcWidget, xcWidget, caddr_t);
 extern xcTimeOutProc savetemp(caddr_t, xcIntervalId *);
 #endif
+extern void incr_changes(objectptr);
 extern void savelibpopup(xcWidget, pointertype, caddr_t);
 extern void savelibrary(xcWidget, int);
 extern void findfonts(objectptr, short *);
@@ -323,7 +330,7 @@
 extern int wirelength(XPoint *, XPoint *);
 extern long finddist(XPoint *,XPoint *, XPoint *);
 extern void calcarc(arcptr);
-extern void initsplines();
+extern void initsplines(void);
 extern void computecoeffs(splineptr, float *, float *, float *, float *,
                           float *, float *);
 extern void calcspline(splineptr);
@@ -333,13 +340,13 @@
 extern short closepoint(polyptr, XPoint *);
 extern short closedistance(polyptr, XPoint *);
 extern void updateinstparam(objectptr);
-extern short checkbounds();
+extern short checkbounds(void);
 extern void window_to_user(short, short, XPoint *);
 extern void user_to_window(XPoint, XPoint *);
-extern float UTopScale();
+extern float UTopScale(void);
 extern float UTopTransScale(float);
-extern XPoint UGetCursor();
-extern XPoint UGetCursorPos();
+extern XPoint UGetCursor(void);
+extern XPoint UGetCursorPos(void);
 extern void u2u_snap(XPoint *);
 extern void snap(short, short, XPoint *);
 extern void UResetCTM(Matrix *);
@@ -351,6 +358,7 @@
 extern void UPreScaleCTM(Matrix *);
 extern short flipadjust(short);
 extern void UPreMultCTM(Matrix *, XPoint, float, short);
+extern void UPreMultCTMbyMat(Matrix *, Matrix *);
 extern void UTransformbyCTM(Matrix *, XPoint *, XPoint *, short);
 extern void UfTransformbyCTM(Matrix *, XfPoint *, XPoint *, short);
 extern void UPopCTM(void);
@@ -364,14 +372,17 @@
 extern void calcextents(genericptr *, short *, short *, short *, short *);
 extern void objinstbbox(objinstptr, XPoint *, Boolean);
 extern void labelbbox(labelptr, XPoint *, objinstptr);
+extern void graphicbbox(graphicptr, XPoint *);
+extern void calcinstbbox(genericptr *, short *, short *, short *, short *);
 extern void calcbboxsingle(genericptr *, objinstptr, short *, short *, short *, short *);
 extern Boolean object_in_library(short, objectptr);
+extern void calcbboxinst(objinstptr);
 extern short find_object(objectptr, objectptr);
 extern void updatepagebounds(objectptr);
 extern void calcbbox(objinstptr);
 extern void calcbboxparam(objectptr, int);
 extern void singlebbox(genericptr *);
-extern void calcbboxselect();
+extern void calcbboxselect(void);
 extern void calcbboxvalues(objinstptr, genericptr *);
 extern void centerview(objinstptr);
 extern void refresh(xcWidget, caddr_t, caddr_t);
@@ -389,7 +400,8 @@
 extern void UDrawTLine(labelptr);
 extern void UDrawXLine(XPoint, XPoint);
 extern void UDrawBox(XPoint, XPoint);
-extern void UDrawBBox();
+extern void UDrawRescaleBox(XPoint *);
+extern void UDrawBBox(void);
 extern void strokepath(XPoint *, short, short, float);
 extern void makesplinepath(splineptr, XPoint *);
 extern void UDrawSpline(splineptr);
@@ -398,12 +410,12 @@
 extern void UDrawArc(arcptr);
 extern void UDrawPath(pathptr);
 extern void UDrawObject(objinstptr, short, int, pushlistptr *);
-extern void TopDoLatex();
+extern void TopDoLatex(void);
 
 /* from help.c: */
 
 extern void showhsb(xcWidget, caddr_t, caddr_t);
-extern void printhelppix();
+extern void printhelppix(void);
 extern void starthelp(xcWidget, caddr_t, caddr_t);
 extern void simplescroll(xcWidget, xcWidget, XPointerMovedEvent *);
 extern void exposehelp(xcWidget, caddr_t, caddr_t);
@@ -421,11 +433,11 @@
 extern char *compat_key_to_string(xcWidget, int);
 extern char *func_to_string(int);
 extern char *key_to_string(int);
-extern void printeditbindings();
+extern void printeditbindings(void);
 extern int add_vbinding(xcWidget, int, int, short);
 extern int add_binding(xcWidget, int, int);
 extern int add_keybinding(xcWidget, const char *, const char *);
-extern void default_keybindings();
+extern void default_keybindings(void);
 extern int remove_binding(xcWidget, int, int);
 extern void remove_keybinding(xcWidget, const char *, const char *);
 
@@ -436,16 +448,17 @@
 
 /* from libraries.c: */
 
-extern short findhelvetica();
-extern void catreturn();
+extern short findhelvetica(void);
+extern void catreturn(void);
 extern int pageposition(short, int, int, int);
-extern short pagelinks();
+extern short pagelinks(int);
 extern short *pagetotals(int, short);
 extern Boolean is_virtual(objinstptr);
 extern int is_page(objectptr);
 extern int is_library(objectptr);
+extern int check_library(char *);
 extern int name_to_library(char *);
-extern void lib_set_changes();
+extern void lib_set_changes(int);
 extern void lib_mark_changed(int);
 extern int libfindobject(objectptr, int *);
 extern int libmoveobject(objectptr, int);
@@ -458,13 +471,13 @@
 extern void pagecatmove(int, int);
 extern void composelib(short);
 extern short finddepend(objinstptr, objectptr **);
-extern void cathide();
-extern void catvirtualcopy();
-extern void catdelete();
+extern void cathide(void);
+extern void catvirtualcopy(void);
+extern void catdelete(void);
 extern void catmove(int, int);
-extern void copycat();
+extern void copycat(void);
 extern void catalog_op(int, int, int);
-extern void changecat();
+extern void changecat(void);
 extern void startcatalog(xcWidget, pointertype, caddr_t);
 
 /* from menucalls.c: */
@@ -480,6 +493,12 @@
 extern void setdscale(xcWidget, XPoint *);
 extern void setosize(xcWidget, objinstptr);
 extern void setwwidth(xcWidget, void *);
+#ifdef TCL_WRAPPER
+extern void renamepage(short);
+extern void renamelib(short);
+extern void setcolormark(int);
+extern void setallstylemarks(u_short);
+#endif
 extern labelptr gettextsize(float **);
 extern void stringparam(xcWidget, caddr_t, caddr_t);
 extern int setelementstyle(xcWidget, u_short, u_short);
@@ -489,15 +508,16 @@
 extern void getgridtype(xcWidget, pointertype, caddr_t);
 extern void newlibrary(xcWidget, caddr_t, caddr_t);
 extern int createlibrary(Boolean);
-extern void makepagebutton();
-extern int findemptylib();
+extern void makepagebutton(void);
+extern int findemptylib(void);
 extern polyptr checkforbbox(objectptr);
 #ifdef TCL_WRAPPER
 extern void setcolor(xcWidget, int);
+extern void setfontmarks(short, short);
 #endif
 extern void startparam(xcWidget, pointertype, caddr_t);
 extern void startunparam(xcWidget, pointertype, caddr_t);
-extern void setdefaultfontmarks();
+extern void setdefaultfontmarks(void);
 extern void setjustbit(xcWidget, pointertype, caddr_t);
 extern void setpinjustbit(xcWidget, pointertype, caddr_t);
 extern void setjust(xcWidget, pointertype, labelptr, short);
@@ -517,6 +537,7 @@
 
 /* from xtfuncs.c: */
 
+extern void makenewfontbutton(void);  /* either here or menucalls.c */
 #ifndef TCL_WRAPPER
 extern void setfloat(xcWidget, float *);
 extern void autoset(xcWidget, xcWidgetList, caddr_t);
@@ -559,7 +580,7 @@
 extern void getfloat(xcWidget, float *, caddr_t);
 extern void setfilename(xcWidget, char **);
 extern void setpagelabel(xcWidget, char *);
-extern void makenewfontbutton();
+extern void makenewfontbutton(void);
 extern void newpagemenu(xcWidget, pointertype, caddr_t);
 extern void makenewencodingbutton(char *, char);
 extern void toggle(xcWidget, pointertype, Boolean *);
@@ -585,19 +606,21 @@
 #ifdef TCL_WRAPPER
 extern Tcl_Obj *tclglobals(objinstptr);
 extern Tcl_Obj *tcltoplevel(objinstptr);
+void ratsnest(objectptr);
 #endif
 
+extern int NameToPinLocation(objinstptr, char *, int *, int *);
 extern Boolean RemoveFromNetlist(objectptr, genericptr);
 extern labelptr NetToLabel(int, objectptr);
 extern void NameToPosition(objinstptr, labelptr, XPoint *);
 extern XPoint *NetToPosition(int, objectptr);
+extern int getsubnet(int, objectptr);
 extern void invalidate_netlist(objectptr);
 extern void remove_netlist_element(objectptr, genericptr);
 extern int updatenets(objinstptr, Boolean);
 extern void createnets(objinstptr, Boolean);
-extern void destroynets();
 extern Boolean nonnetwork(polyptr);
-extern int globalmax();
+extern int globalmax(void);
 extern LabellistPtr geninfolist(objectptr, objinstptr, char *);
 extern void gennetlist(objinstptr);
 extern void gencalls(objectptr);
@@ -609,7 +632,9 @@
 extern void copy_bus(Genericlist *, Genericlist *);
 extern Genericlist *is_resolved(genericptr *, pushlistptr, objectptr *);
 extern Boolean highlightnet(objectptr, objinstptr, int, u_char);
+extern void highlightnetlist(objectptr, objinstptr, u_char);
 extern int pushnetwork(pushlistptr, objectptr);
+extern Boolean match_buses(Genericlist *, Genericlist *, int);
 extern int onsegment(XPoint *, XPoint *, XPoint *);
 extern Boolean neardist(long);
 extern Boolean nearpoint(XPoint *, XPoint *);
@@ -647,18 +672,22 @@
 extern void freepcb(struct Ptab *);
 extern void freegenlist(Genericlist *);
 extern void freepolylist(PolylistPtr *);
+extern void freenetlist(objectptr);
 extern void freelabellist(LabellistPtr *);
 extern void freecalls(CalllistPtr);
 extern void freenets(objectptr);
 extern void freetemplabels(objectptr);
-extern void freeglobals();
+extern void freeglobals(void);
 extern void destroynets(objectptr);
 extern int  cleartraversed(objectptr);
 extern int  checkvalid(objectptr);
 extern void clearlocalpins(objectptr);
 extern void append_included(char *);
 extern Boolean check_included(char *);
-extern void free_included();
+extern void free_included(void);
+
+/* from ngspice.c: */
+extern int exit_spice(void);
 
 /* from parameter.c: */ 
 
@@ -667,6 +696,7 @@
 extern oparamptr match_instance_param(objinstptr, char *);
 extern oparamptr find_param(objinstptr, char *);
 extern int get_num_params(objectptr);
+extern void free_all_eparams(genericptr);
 extern void free_object_param(objectptr, oparamptr);
 extern void free_instance_param(objinstptr, oparamptr);
 extern void free_element_param(genericptr, eparamptr);
@@ -677,10 +707,12 @@
 extern void makeexprparam(objectptr, char *, char *, int);
 extern void makefloatparam(objectptr, char *, float);
 extern void makestringparam(objectptr, char *, stringpart *);
+extern void std_eparam(genericptr, char *);
 extern void indicateparams(genericptr);
+extern void setparammarks(genericptr);
 extern void makenumericalp(genericptr *, u_int, char *);
 extern void noparmstrcpy(u_char *, u_char *);
-extern void insertparam();
+extern void insertparam(void);
 extern void makeparam(labelptr, char *);
 extern void searchinst(objectptr, objectptr, char *);
 extern stringpart *searchparam(stringpart *);
@@ -693,13 +725,14 @@
 extern oparamptr parampos(objectptr, labelptr, char *, short *, short *);
 extern int opsubstitute(objectptr, objinstptr);
 extern int psubstitute(objinstptr);
+extern Boolean has_param(genericptr);
 extern oparamptr copyparameter(oparamptr);
 extern void pwriteback(objinstptr);
 extern short paramlen(u_char *);
 extern int natstrlen(u_char *);
 extern int natstrcmp(u_char *, u_char *);
 extern void curtail(u_char *);
-extern int checklibtop();
+extern int checklibtop(void);
 extern void removeinst(objinstptr);
 extern void removeparams(objectptr);
 extern void resolveparams(objinstptr);
@@ -707,8 +740,8 @@
 /* from python.c: */
 
 #ifdef HAVE_PYTHON
-extern void init_interpreter();
-extern void exit_interpreter();
+extern void init_interpreter(void);
+extern void exit_interpreter(void);
 #endif
 
 #ifdef HAVE_XPM
@@ -718,9 +751,9 @@
 /* from rcfile.c: */
 
 extern short execcommand(short, char *);
-extern void defaultscript();
-extern void execscript();
-extern void loadrcfile();
+extern void defaultscript(void);
+extern void execscript(void);
+extern void loadrcfile(void);
 #ifndef HAVE_PYTHON
 extern short readcommand(short, FILE *);
 #endif
@@ -737,6 +770,8 @@
 /* from flate.c */
 
 #ifdef HAVE_LIBZ
+extern u_long large_deflate(u_char *, u_long, u_char *, u_long);
+extern u_long large_inflate(u_char *, u_long, u_char **, u_long);
 extern unsigned long ps_deflate (unsigned char *, unsigned long,
 	unsigned char *, unsigned long);
 extern unsigned long ps_inflate (unsigned char *, unsigned long,
@@ -745,38 +780,39 @@
 
 /* from render.c: */
 
-extern void ghostinit();
+extern void ghostinit(void);
 extern void send_client(Atom);
-extern void ask_for_next();
-extern void start_gs();
+extern void ask_for_next(void);
+extern void start_gs(void);
 extern void parse_bg(FILE *, FILE *);
-extern void bg_get_bbox();
+extern void bg_get_bbox(void);
 extern void backgroundbbox(int);
 extern void readbackground(FILE *);
 extern void savebackground(FILE *, char *);
 extern void register_bg(char *);
-extern void loadbackground();
+extern void loadbackground(void);
 extern void send_to_gs(char *);
-extern int renderbackground();
-extern int copybackground();
-extern int exit_gs();
-extern int reset_gs();
+extern int renderbackground(void);
+extern int copybackground(void);
+extern int exit_gs(void);
+extern int reset_gs(void);
 
 #ifndef TCL_WRAPPER
-extern Boolean render_client();
+extern Boolean render_client(XEvent *);
 #endif
 
 /* from schema.c: */
 
 extern objectptr NameToPageObject(char *, objinstptr *, int *);
 extern objectptr NameToObject(char *, objinstptr *, Boolean);
+extern int checkpagename(objectptr);
 extern void callwritenet(xcWidget, pointertype, caddr_t);
 extern void startconnect(xcWidget, caddr_t, caddr_t);
 extern void connectivity(xcWidget, caddr_t, caddr_t);
 extern Boolean setobjecttype(objectptr);
 extern void pinconvert(labelptr, pointertype);
 extern void dopintype(xcWidget, pointertype, caddr_t);
-extern void setsymschem();
+extern void setsymschem(void);
 extern int findpageobj(objectptr);
 extern void collectsubschems(int);
 extern int findsubschems(int, objectptr, int, short *);
@@ -786,7 +822,7 @@
 extern void changeotherpins(labelptr, stringpart *);
 extern void swapschem(int, int);
 extern void dobeforeswap(xcWidget, caddr_t, caddr_t);
-extern void schemdisassoc();
+extern void schemdisassoc(void);
 extern void startschemassoc(xcWidget, pointertype, caddr_t);
 extern Boolean schemassoc(objectptr, objectptr);
 #ifndef TCL_WRAPPER
@@ -802,27 +838,30 @@
 extern void geneasydraw(short, int, objectptr, objinstptr);
 extern void gendrawselected(short *, objectptr, objinstptr);
 extern selection *genselectelement(short, u_char, objectptr, objinstptr);
-extern short *allocselect();
-extern void setoptionmenu();
+extern short *allocselect(void);
+extern void setoptionmenu(void);
 extern int test_insideness(int, int, XPoint *);
 extern Boolean pathselect(genericptr *, short, float);
 extern Boolean areaelement(genericptr *);
-extern void selectarea();
+extern void selectarea(void);
 extern void startdesel(xcWidget, caddr_t, caddr_t);
 extern void deselect(xcWidget, caddr_t, caddr_t);
-extern void draw_normal_selected();
-extern void draw_all_selected();
-extern void clearselects_noundo();
-extern void clearselects();
-extern void unselect_all();
+extern void draw_normal_selected(objectptr, objinstptr);
+extern void freeselects(void);
+extern void draw_all_selected(void);
+extern void clearselects_noundo(void);
+extern void clearselects(void);
+extern void unselect_all(void);
 extern selection *recurselect(short, u_char, pushlistptr *);
 extern short *recurse_select_element(short, u_char);
-extern void startselect();
-extern void trackselarea();
+extern void startselect(void);
+extern void trackselarea(void);
+extern void trackrescale(void);
 
 /* from text.c: */
 
 extern Boolean hasparameter(labelptr);
+extern void joinlabels(void);
 extern void drawparamlabels(labelptr, short);
 extern stringpart *nextstringpart(stringpart *, objinstptr);
 extern stringpart *nextstringpartrecompute(stringpart *, objinstptr);
@@ -841,6 +880,8 @@
 extern int textcomp(stringpart *, char *, objinstptr);
 extern int textncomp(stringpart *, char *, objinstptr);
 extern int stringcomp(stringpart *, stringpart *);
+extern Boolean issymbolfont(int);
+extern Boolean isisolatin1(int);
 extern int stringcomprelaxed(stringpart *, stringpart *, objinstptr);
 extern int stringparts(stringpart *);
 extern int stringlength(stringpart *, Boolean, objinstptr);
@@ -869,9 +910,11 @@
 extern void W2printf(char *, ...);
 extern void W3printf(char *, ...);
 
-extern XCWindowData *create_new_window();
+extern XCWindowData *create_new_window(void);
+extern void pre_initialize(void);
+extern void post_initialize(void);
 extern void delete_window(XCWindowDataPtr);
-extern void printeventmode();
+extern void printeventmode(void);
 extern void popupprompt(xcWidget, char *, char *, void (*function)(),
                         buttonsave *, const char *);
 extern void getproptext(xcWidget, propstruct *, caddr_t);
@@ -882,7 +925,7 @@
 extern int query_named_color(char *);
 extern caddr_t CvtStringToPixel(XrmValuePtr, int *, XrmValuePtr, XrmValuePtr);
 extern void outputpopup(xcWidget, caddr_t, caddr_t);
-extern void docommand();
+extern void docommand(void);
 extern void destroypopup(xcWidget, popupstruct *, caddr_t);
 extern int xc_alloccolor(char *);
 extern void dointr(int);
@@ -891,10 +934,10 @@
 extern u_short getchanges(objectptr);
 extern void quitcheck(xcWidget, caddr_t, caddr_t);
 extern void quit(xcWidget, caddr_t);
-extern void resizetoolbar();
+extern void resizetoolbar(void);
 extern void writescalevalues(char *, char *, char *);
 #ifdef TCL_WRAPPER
-extern Tcl_Obj *Tcl_NewHandleObj();
+/* XXX extern Tcl_Obj *Tcl_NewHandleObj(); */
 extern int Tcl_GetHandleFromObj(Tcl_Interp *, Tcl_Obj *, void **);
 #else
 extern void updatetext(xcWidget, xcWidgetList, caddr_t);
@@ -902,4 +945,4 @@
 #endif
 
 
-extern void makecursors();
+extern void makecursors(void);
diff --exclude=configure -u /home/ldoolitt/cvs/xcircuit-3.6/tclxcircuit.c xcircuit-3.6-cvs/tclxcircuit.c
--- /home/ldoolitt/cvs/xcircuit-3.6/tclxcircuit.c	2006-05-30 11:54:02.000000000 -0700
+++ xcircuit-3.6-cvs/tclxcircuit.c	2006-06-01 09:30:40.000000000 -0700
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <stdarg.h>	/* for va_copy() */
 #include <stdlib.h>	/* for atoi() and others */
+#include <ctype.h>
 #ifndef _MSC_VER
 #include <unistd.h>     /* for usleep() */
 #endif
@@ -822,7 +823,7 @@
 
 /*----------------------------------------------------------------------*/
 /* Handle (integer representation of internal xcircuit object) checking	*/
-/* if "checkobject" is NULL, then 
+/* if "checkobject" is NULL, then                                       */
 /*----------------------------------------------------------------------*/
 
 genericptr *CheckHandle(pointertype eaddr, objectptr checkobject)
@@ -1485,7 +1486,7 @@
 	    else if (!strncmp(option + 1, "quiet", 5)) {
 	       quiet = TRUE;
 	    }
-	    else if (sscanf(option, "%d", &refpoint.x) == 1) {
+	    else if (sscanf(option, "%hd", &refpoint.x) == 1) {
 	       break;	/* This is probably a negative point position! */
 	    }
 	    objc--;
@@ -5514,7 +5515,7 @@
 	    }
 	    if (winptr == NULL) {
 	       Tcl_SetResult(interp, "No such window\n", NULL);
-	       return;
+	       return TCL_ERROR;
 	    }
 	 }
 	 break;
diff --exclude=configure -u /home/ldoolitt/cvs/xcircuit-3.6/tkSimple.c xcircuit-3.6-cvs/tkSimple.c
--- /home/ldoolitt/cvs/xcircuit-3.6/tkSimple.c	2006-04-10 14:52:19.000000000 -0700
+++ xcircuit-3.6-cvs/tkSimple.c	2006-06-01 09:30:40.000000000 -0700
@@ -12,6 +12,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include <tk.h>
 
diff --exclude=configure -u /home/ldoolitt/cvs/xcircuit-3.6/undo.c xcircuit-3.6-cvs/undo.c
--- /home/ldoolitt/cvs/xcircuit-3.6/undo.c	2006-04-10 14:52:19.000000000 -0700
+++ xcircuit-3.6-cvs/undo.c	2006-06-01 09:30:40.000000000 -0700
@@ -588,7 +588,7 @@
    thisrecord = xobjs.undostack;
    if (thisrecord == NULL) {
       Fprintf(stderr, "Nothing to undo!\n");
-      return;
+      return 0;
    }
 
    xobjs.undostack = thisrecord->next;
@@ -926,7 +926,7 @@
    thisrecord = xobjs.redostack;
    if (thisrecord == NULL) {
       Fprintf(stderr, "Nothing to redo!\n");
-      return;
+      return 0;
    }
    xobjs.undostack = thisrecord;
    xobjs.redostack = thisrecord->last;
diff --exclude=configure -u /home/ldoolitt/cvs/xcircuit-3.6/xcircuit.c xcircuit-3.6-cvs/xcircuit.c
--- /home/ldoolitt/cvs/xcircuit-3.6/xcircuit.c	2006-05-30 11:54:02.000000000 -0700
+++ xcircuit-3.6-cvs/xcircuit.c	2006-06-01 09:30:40.000000000 -0700
@@ -36,6 +36,7 @@
 #include <errno.h>
 #include <limits.h>
 #include <locale.h>
+#include <ctype.h>
 #ifndef XC_WIN32
 #include <unistd.h>   /* for unlink() */
 
@@ -513,6 +514,7 @@
       measurestr(xobjs.pagelist[areawin->page]->snapspace, buf2);
       Wprintf("Grid %.50s : Snap %.50s", buf1, buf2);
    }
+   /* XXX where is the xcTimeOutProc to return? */
 }
 
 #endif /* TCL_WRAPPER */

More information about the Xcircuit-dev mailing list