Remove unspecified () for function pointers.

jrincayc · Jan 24, 2025 · c420da9 · c420da9
1 parent b408d37
commit c420da9
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 16 deletions.
diff --git a/coms.c b/coms.c
@@ -543,7 +543,6 @@ NODE *lshell(NODE *args) {
 #endif
     return(UNBOUND);
 #else
-    extern FILE *popen();
     char cmdbuf[300];
     FILE *strm;
     NODE *head = NIL, *tail = NIL, *this;

diff --git a/eval.c b/eval.c
@@ -278,7 +278,7 @@ void reset_args(NODE *old_stack) {
 NODE *bf3(NODE *name) {
     NODE *string = cnv_node_to_strnode(name);
     return make_strnode(getstrptr(string)+3, getstrhead(string),
-			getstrlen(string)-3, nodetype(string), strcpy);
+			getstrlen(string)-3, nodetype(string), strnzcpy);
 }
 
 NODE *deep_copy(NODE *expresn) {

diff --git a/globals.h b/globals.h
@@ -50,7 +50,7 @@ extern jmp_buf iblk_buf;
 
 /* logodata.c */
 extern char *strnzcpy(char *, char *, int);
-extern char *word_strnzcpy(char *, NODE *, int);
+extern char *word_strnzcpy(char *, char *, int);
 extern char *noparity_strnzcpy(char *, char *, int);
 extern char *backslashed_strnzcpy(char *, char *, int);
 extern char *mend_strnzcpy(char *, char *, int);
@@ -62,7 +62,7 @@ extern int low_strncmp(char *, char *, int);
 extern int noparity_strncmp(char *, char *, int);
 extern int noparitylow_strncmp(char *, char *, int);
 extern NODE *make_strnode(char *, struct string_block *, int,
-			  NODETYPES, char *(*)());
+			  NODETYPES, char *(*)(char *, char *, int));
 extern void make_runparse(NODE *);
 extern NODE *make_quote(NODE *);
 extern NODE *maybe_quote(NODE *);
@@ -177,7 +177,7 @@ extern NODE *lbeforep(NODE *);
 
 /* intern.c */
 extern NODE *hash_table[HASH_LEN];
-void map_oblist(void (*)());
+void map_oblist(void (*)(NODE *));
 extern NODE *make_instance(NODE *, NODE *);
 extern NODE *intern(NODE *);
 
@@ -617,8 +617,8 @@ extern void wxlPrintPict(void);
 extern void wxlPrintPreviewPict(void);
 extern void wxlPrintText(void);
 extern void wxlPrintPreviewText(void);
-extern NODE*IncreaseFont(void *);
-extern NODE*DecreaseFont(void *);
+extern NODE*IncreaseFont(NODE *);
+extern NODE*DecreaseFont(NODE *);
 extern int turtlePosition_x;
 extern int turtlePosition_y;
 #define SCREEN_WIDTH		1

diff --git a/init.c b/init.c
@@ -48,7 +48,7 @@ typedef struct priminfo {
     short defargs;
     short maxargs;
     short priority;
-    NODE *(*prim) ();
+    NODE *(*prim) (NODE *);
 } PRIMTYPE;
 
 NODE *Right_Paren, *Left_Paren, *Redefp, *Caseignoredp, *Erract, *Printdepthlimit,

diff --git a/intern.c b/intern.c
@@ -27,7 +27,7 @@
 
 NODE *hash_table[HASH_LEN] = {NIL};
 
-void map_oblist(void (*fcn)()) {
+void map_oblist(void (*fcn)(NODE *)) {
     int i;
     NODE *nd;
 

diff --git a/logo.h b/logo.h
@@ -288,6 +288,7 @@ struct string_block {
 #define incstrrefcnt(sh)        (((sh)->str_refcnt)++)
 #define decstrrefcnt(sh)        (--((sh)->str_refcnt))
 
+typedef struct logo_node NODE;
 typedef struct logo_node {
     NODETYPES node_type;
     int my_gen; /* Nodes's Generation */ /*GC*/
@@ -307,7 +308,7 @@ typedef struct logo_node {
 	    FIXNUM nstring_len;
 	} nstring;
 	struct {
-	    struct logo_node * (*nprim_fun) ();
+	    struct logo_node * (*nprim_fun) (NODE *);
 	    short npriority;
 	    short nmin_args;
 	    short ndef_args;

diff --git a/logodata.c b/logodata.c
@@ -78,7 +78,8 @@ char *strnzcpy(char *s1, char *s2, int n) {
     return(s1);
 }
 
-char *word_strnzcpy(char *s1, NODE *kludge, int n) {  /* KLUDGE! */
+char *word_strnzcpy(char *s1, char *kludge_char, int n) {  /* KLUDGE! */
+    NODE *kludge = (NODE *)kludge_char;
     char *temp = s1;
 
     while (kludge != NIL) {
@@ -285,7 +286,7 @@ int noparitylow_strncmp(char *s1, char *s2, int n) {
 }
 
 NODE *make_strnode(char *strptr, struct string_block *strhead, int len,
-		   NODETYPES typ, char *(*copy_routine)())
+		   NODETYPES typ, char *(*copy_routine)(char *, char *, int))
 {
     NODE *strnode;
 

diff --git a/main.c b/main.c
@@ -196,9 +196,13 @@ void do_keyact(int ch) {
     }
 }
 
-
+#ifdef SIG_TAKES_ARG
+void (*intfuns[])(int) = {0, logo_stop, logo_pause, mouse_down,
+			     delayed_keyact};
+#else
 void (*intfuns[])() = {0, logo_stop, logo_pause, mouse_down,
 			     delayed_keyact};
+#endif
 
 void delayed_int() {
 #ifdef SIG_TAKES_ARG

diff --git a/wrksp.c b/wrksp.c
@@ -346,11 +346,11 @@ NODE *find_to(NODE *line) {
 		    ((c = *(p-1)) == ' ' || c == '\t' || c == '\n'))
 		return make_strnode(p, getstrhead(line),
 				    getstrlen(line)-(p-lp),
-				    nodetype(line), strcpy);
+				    nodetype(line), strnzcpy);
 	    if (c == '[')
 		return make_strnode(p, getstrhead(line),
 				    strchr(p, ']')-p,
-				    nodetype(line), strcpy);
+				    nodetype(line), strnzcpy);
 	}
 	p++;
     }
@@ -1815,7 +1815,7 @@ NODE *cpdf_newname(NODE *name, NODE*titleline) {
     p2 = p1+strcspn(p1, " \t");
     sprintf(buf, "%.*s%.*s%s",
 	    (int)(p1-titlestr), titlestr, (int)getstrlen(nname), namestr, p2);
-    return make_strnode(buf, NULL, strlen(buf), STRING, strcpy);
+    return make_strnode(buf, NULL, strlen(buf), STRING, strnzcpy);
 }
 
 NODE *lcopydef(NODE *args) {