commit 7e2f51eb883e381d0e1608559e6734445a1f290e
parent 120db204ed669fc251b84f12f11b797cfdf0066f
Author: ssnf <ssnf@ssnf.xyz>
Date: Tue, 18 Nov 2025 00:07:08 +0000
simplify function signatures
Diffstat:
| M | sim.c | | | 104 | +++++++++++++++++++++++++++++++++++++++---------------------------------------- |
| M | sim.h | | | 10 | +++++----- |
2 files changed, 56 insertions(+), 58 deletions(-)
diff --git a/sim.c b/sim.c
@@ -85,68 +85,66 @@ typedef struct {
ushort size;
} Frame;
-static Rune* Strchr(Rune *s, Rune r);
-static String Strn(Rune *r, ulong n);
-static Rune* Strnstr(Rune *s1, Rune *s2, ulong n);
-static String Utf(char* s);
-static void blind_reader(Frame* fr, Posn p0);
-static void blind_writer(ushort line, ushort offset, ushort top, ushort bot);
-static void buf_add(
- String* is, String* ds, uint c, uint arg, uint count
-);
-static void buf_free(Buffer* p);
-static int c2r(Rune *r, uchar c, uchar *seq);
-static void change(int arg);
-static void count(int arg);
-static void curmov(ushort x, ushort y);
+static Rune* Strchr(Rune*, Rune);
+static String Strn(Rune*, ulong);
+static Rune* Strnstr(Rune*, Rune*, ulong);
+static String Utf(char*);
+static void blind_reader(Frame*, Posn);
+static void blind_writer(ushort, ushort, ushort, ushort);
+static void buf_add(String*, String*, uint, uint, uint);
+static void buf_free(Buffer*);
+static int c2r(Rune*, uchar, uchar*);
+static void change(int);
+static void count(int);
+static void curmov(ushort, ushort);
static uint curpos(void);
-static void delete(int arg);
-static void dot(int arg);
-static void redo(int arg);
-static void escape(int c);
+static void delete(int);
+static void dot(int);
+static void redo(int);
+static void escape(int);
static uchar getc2(void);
static Rune getr(void);
static void init(void);
-static void input(String* s, uint line, char* prefix);
-static void insert(int arg);
-static int isword(uchar c);
-static void file_close(int arg);
-static void file_init(File* f);
-static void file_load(File* f);
-static void file_open(int arg);
-static void file_save(int arg);
-static void fr_add(Frame* fr, Address a);
+static void input(String*, uint, char*);
+static void insert(int);
+static int isword(uchar);
+static void file_close(int);
+static void file_init(File*);
+static void file_load(File*);
+static void file_open(int);
+static void file_save(int);
+static void fr_add(Frame*, Address);
static void fr_calc(void);
-static void fr_close(Frame* fr);
-static void fr_init(Frame* fr);
-static void fr_insert(Frame* p, Frame q, ushort n);
-static void fr_insure(Frame* fr, ushort n);
+static void fr_close(Frame*);
+static void fr_init(Frame*);
+static void fr_insert(Frame*, Frame, ushort);
+static void fr_insure(Frame*, ushort);
static void fr_update(void);
static void fr_zero(Frame*);
-static void gmove(int arg);
-static void msg(uint line, char* fmt, ...);
-static void paste(int arg);
-static void pline(int arg);
-static uchar r2u(char *s, Rune r);
-static uint runesiz(Rune c, ulong wx);
-static void search(int arg);
-static int selection(int arg);
-static ulong str2u(char** buf, String s);
-static void str_init(String* p);
-static void str_close(String* p);
-static void str_dup(String* p, String q);
-static void str_zero(String* p);
-static void str_insure(String* p, ulong n);
-static void str_addr(String* p, Rune r);
-static void str_adds(String* p, String q);
-static void str_delr(String* p);
-static void str_insert(String* p, String q, Posn p0);
-static void str_delete(String* p, Posn p0, Posn p1);
-static void u2str(String *s, char *u);
-static void undo(int arg);
+static void gmove(int);
+static void msg(uint, char*, ...);
+static void paste(int);
+static void pline(int);
+static uchar r2u(char*, Rune);
+static uint runesiz(Rune, ulong);
+static void search(int);
+static int selection(int);
+static ulong str2u(char**, String);
+static void str_init(String*);
+static void str_close(String*);
+static void str_dup(String*, String);
+static void str_zero(String*);
+static void str_insure(String*, ulong);
+static void str_addr(String*, Rune);
+static void str_adds(String*, String);
+static void str_delr(String*);
+static void str_insert(String*, String, Posn);
+static void str_delete(String*, Posn, Posn);
+static void u2str(String*, char*);
+static void undo(int);
static void move(int);
static void quit(int);
-static void yank(int arg);
+static void yank(int);
static Frame frame[FILECOUNT], *fr = frame;
static File file[FILECOUNT], *f = file;
diff --git a/sim.h b/sim.h
@@ -12,10 +12,10 @@ typedef struct {
ushort t;
} Window;
-extern void die(char* fmt, ...);
-extern void* emalloc(ulong n);
-extern void* erealloc(void* p, ulong n);
+extern void die(char*, ...);
+extern void* emalloc(ulong);
+extern void* erealloc(void*, ulong);
extern void resize(void);
extern void win_end(void);
-extern void win_init(Window* w);
-extern void win_query(Window* w);
+extern void win_init(Window*);
+extern void win_query(Window*);