Normalized ulong type. - sam - An updated version of the sam text editor.
(HTM) git clone git://vernunftzentrum.de/sam.git
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) LICENSE
---
(DIR) commit b162248ab4f3f087457c385a3007f2fd47ddef5e
(DIR) parent eab3ebc63fb97b2ee4f5dd3ccd908b03baaef1a5
(HTM) Author: Rob King <jking@deadpixi.com>
Date: Tue, 27 Sep 2016 10:37:14 -0500
Normalized ulong type.
Diffstat:
include/frame.h | 16 ++++++++--------
include/u.h | 7 -------
libframe/frbox.c | 2 +-
libframe/frdelete.c | 2 +-
libframe/frinsert.c | 4 ++--
libframe/frptofchar.c | 10 +++++-----
libframe/frselect.c | 2 +-
sam/disc.c | 2 +-
sam/io.c | 4 ++--
sam/mesg.c | 2 +-
sam/sam.h | 12 ++++++------
sam/string.c | 2 +-
sam/unix.c | 8 ++++----
samterm/flayer.c | 10 +++++-----
samterm/flayer.h | 6 +++---
samterm/io.c | 2 +-
samterm/main.c | 10 +++++-----
samterm/mesg.c | 2 +-
samterm/rasp.c | 6 +++---
samterm/samterm.h | 10 +++++-----
20 files changed, 56 insertions(+), 63 deletions(-)
---
(DIR) diff --git a/include/frame.h b/include/frame.h
@@ -27,7 +27,7 @@ struct Frame
Rectangle r; /* in which text appears */
Rectangle entire; /* of full frame */
Frbox *box;
- ulong p0, p1; /* selection */
+ uint64_t p0, p1; /* selection */
short left; /* left edge of text */
ushort nbox, nalloc;
ushort maxtab; /* max size of tab, in pixels */
@@ -39,10 +39,10 @@ struct Frame
ushort modified; /* changed since frselect() */
};
-ulong frcharofpt(Frame*, Point);
-Point frptofchar(Frame*, ulong);
-int frdelete(Frame*, ulong, ulong);
-void frinsert(Frame*, Rune*, Rune*, ulong);
+uint64_t frcharofpt(Frame*, Point);
+Point frptofchar(Frame*, uint64_t);
+int frdelete(Frame*, uint64_t, uint64_t);
+void frinsert(Frame*, Rune*, Rune*, uint64_t);
void frselect(Frame*, Mouse*);
void frselectp(Frame*, Fcode);
void frselectf(Frame*, Point, Point, Fcode);
@@ -59,7 +59,7 @@ void _frfreebox(Frame*, int, int);
void _frmergebox(Frame*, int);
void _frdelbox(Frame*, int, int);
void _frsplitbox(Frame*, int, int);
-int _frfindbox(Frame*, int, ulong, ulong);
+int _frfindbox(Frame*, int, uint64_t, uint64_t);
void _frclosebox(Frame*, int, int);
int _frcanfit(Frame*, Point, Frbox*);
void _frcklinewrap(Frame*, Point*, Frbox*);
@@ -69,8 +69,8 @@ int _frnewwid(Frame*, Point, Frbox*);
void _frclean(Frame*, Point, int, int);
void _frredraw(Frame*, Point);
void _fraddbox(Frame*, int, int);
-Point _frptofcharptb(Frame*, ulong, Point, int);
-Point _frptofcharnb(Frame*, ulong, int);
+Point _frptofcharptb(Frame*, uint64_t, Point, int);
+Point _frptofcharnb(Frame*, uint64_t, int);
int _frstrlen(Frame*, int);
extern int tabwidth;
(DIR) diff --git a/include/u.h b/include/u.h
@@ -12,10 +12,3 @@
typedef uint16_t ushort;
typedef uint8_t uchar;
typedef uint16_t Rune;
-
-#if USE64BITS == 0
-typedef uint32_t ulong;
-#else
-typedef uint64_t ulong;
-#endif
-
(DIR) diff --git a/libframe/frbox.c b/libframe/frbox.c
@@ -146,7 +146,7 @@ _frmergebox(Frame *f, int bn) /* merge bn and bn+1 */
}
int
-_frfindbox(Frame *f, int bn, ulong p, ulong q) /* find box containing q and put q on a box boundary */
+_frfindbox(Frame *f, int bn, uint64_t p, uint64_t q) /* find box containing q and put q on a box boundary */
{
Frbox *b;
(DIR) diff --git a/libframe/frdelete.c b/libframe/frdelete.c
@@ -4,7 +4,7 @@
#include <frame.h>
int
-frdelete(Frame *f, ulong p0, ulong p1)
+frdelete(Frame *f, uint64_t p0, uint64_t p1)
{
Point pt0, pt1, ppt0;
Frbox *b;
(DIR) diff --git a/libframe/frinsert.c b/libframe/frinsert.c
@@ -76,7 +76,7 @@ bxscan(Frame *f, Rune *sp, Rune *ep, Point *ppt)
static
void
-chopframe(Frame *f, Point pt, ulong p, int bn)
+chopframe(Frame *f, Point pt, uint64_t p, int bn)
{
Frbox *b;
@@ -96,7 +96,7 @@ chopframe(Frame *f, Point pt, ulong p, int bn)
}
void
-frinsert(Frame *f, Rune *sp, Rune *ep, ulong p0)
+frinsert(Frame *f, Rune *sp, Rune *ep, uint64_t p0)
{
Point pt0, pt1, ppt0, ppt1, pt;
Frbox *b;
(DIR) diff --git a/libframe/frptofchar.c b/libframe/frptofchar.c
@@ -5,7 +5,7 @@
#include <frame.h>
Point
-_frptofcharptb(Frame *f, ulong p, Point pt, int bn)
+_frptofcharptb(Frame *f, uint64_t p, Point pt, int bn)
{
uchar *s;
Frbox *b;
@@ -34,13 +34,13 @@ _frptofcharptb(Frame *f, ulong p, Point pt, int bn)
}
Point
-frptofchar(Frame *f, ulong p)
+frptofchar(Frame *f, uint64_t p)
{
return _frptofcharptb(f, p, Pt(f->left, f->r.min.y), 0);
}
Point
-_frptofcharnb(Frame *f, ulong p, int nb) /* doesn't do final _fradvance to next line */
+_frptofcharnb(Frame *f, uint64_t p, int nb) /* doesn't do final _fradvance to next line */
{
Point pt;
int nbox;
@@ -64,14 +64,14 @@ _frgrid(Frame *f, Point p)
return p;
}
-ulong
+uint64_t
frcharofpt(Frame *f, Point pt)
{
Point qt;
int w, bn;
uchar *s;
Frbox *b;
- ulong p;
+ uint64_t p;
Rune r;
pt = _frgrid(f, pt);
(DIR) diff --git a/libframe/frselect.c b/libframe/frselect.c
@@ -7,7 +7,7 @@
void
frselect(Frame *f, Mouse *m) /* when called, button 1 is down */
{
- ulong p0, p1, q;
+ uint64_t p0, p1, q;
Point mp, pt0, pt1, qt;
mp = m->xy;
(DIR) diff --git a/sam/disc.c b/sam/disc.c
@@ -313,7 +313,7 @@ void
bkalloc(Disc *d, int n)
{
Discdesc *dd = d->desc;
- ulong bnum;
+ uint64_t bnum;
if(dd->free.nused)
bnum = dd->free.longptr[--dd->free.nused];
(DIR) diff --git a/sam/io.c b/sam/io.c
@@ -27,7 +27,7 @@ writef(File *f)
Posn n;
char *name;
int i, samename, newfile;
- ulong dev, qid;
+ uint64_t dev, qid;
long mtime, appendonly, length;
newfile = 0;
@@ -77,7 +77,7 @@ readio(File *f, int *nulls, int setdate)
Rune *r;
Posn nt;
Posn p = addr.r.p2;
- ulong dev, qid;
+ uint64_t dev, qid;
long mtime;
char buf[BLOCKSIZE+1], *s;
(DIR) diff --git a/sam/mesg.c b/sam/mesg.c
@@ -526,7 +526,7 @@ inshort(void)
long
inlong(void)
{
- ulong n;
+ uint64_t n;
n = (inp[7]<<24) | (inp[6]<<16) | (inp[5]<<8) | inp[4];
n = (n<<16) | (inp[3]<<8) | inp[2];
(DIR) diff --git a/sam/sam.h b/sam/sam.h
@@ -112,7 +112,7 @@ struct Block
struct Discdesc
{
int fd; /* plan 9 file descriptor of temp file */
- ulong nbk; /* high water mark */
+ uint64_t nbk; /* high water mark */
List free; /* array of free block indices */
};
@@ -257,8 +257,8 @@ void dellist(List*, int);
void doubleclick(File*, Posn);
void dprint(char*, ...);
void edit(File*, int);
-void *emalloc(ulong);
-void *erealloc(void*, ulong);
+void *emalloc(uint64_t);
+void *erealloc(void*, uint64_t);
void error(Err);
void error_c(Err, int);
void error_s(Err, char*);
@@ -301,8 +301,8 @@ void snarf(File*, Posn, Posn, Buffer*, int);
void sortname(File*);
void startup(char*, int, char**, char**);
void state(File*, int);
-int statfd(int, ulong*, ulong*, long*, long*, long*);
-int statfile(char*, ulong*, ulong*, long*, long*, long*);
+int statfd(int, uint64_t*, uint64_t*, long*, long*, long*);
+int statfile(char*, uint64_t*, uint64_t*, long*, long*, long*);
void Straddc(String*, int);
void Strclose(String*);
int Strcmp(String*, String*);
@@ -312,7 +312,7 @@ void Strduplstr(String*, String*);
void Strinit(String*);
void Strinit0(String*);
void Strinsert(String*, String*, Posn);
-void Strinsure(String*, ulong);
+void Strinsure(String*, uint64_t);
void Strzero(String*);
int Strlen(Rune*);
char *Strtoc(String*);
(DIR) diff --git a/sam/string.c b/sam/string.c
@@ -72,7 +72,7 @@ Straddc(String *p, int c)
}
void
-Strinsure(String *p, ulong n)
+Strinsure(String *p, uint64_t n)
{
if(n > STRSIZE)
error(Etoolong);
(DIR) diff --git a/sam/unix.c b/sam/unix.c
@@ -57,7 +57,7 @@ print_s(char *s, String *a)
}
int
-statfile(char *name, ulong *dev, ulong *id, long *time, long *length, long *appendonly)
+statfile(char *name, uint64_t *dev, uint64_t *id, long *time, long *length, long *appendonly)
{
struct stat dirb;
@@ -77,7 +77,7 @@ statfile(char *name, ulong *dev, ulong *id, long *time, long *length, long *appe
}
int
-statfd(int fd, ulong *dev, ulong *id, long *time, long *length, long *appendonly)
+statfd(int fd, uint64_t *dev, uint64_t *id, long *time, long *length, long *appendonly)
{
struct stat dirb;
@@ -148,7 +148,7 @@ waitfor(int pid)
}
void*
-emalloc(ulong n)
+emalloc(uint64_t n)
{
void *p;
@@ -162,7 +162,7 @@ emalloc(ulong n)
}
void*
-erealloc(void *p, ulong n)
+erealloc(void *p, uint64_t n)
{
p = realloc(p, n);
if(p == 0)
(DIR) diff --git a/samterm/flayer.c b/samterm/flayer.c
@@ -30,7 +30,7 @@ flstart(Rectangle r)
}
void
-flnew(Flayer *l, Rune *(*fn)(Flayer*, long, ulong*), int u0, void *u1)
+flnew(Flayer *l, Rune *(*fn)(Flayer*, long, uint64_t*), int u0, void *u1)
{
if(nllist == nlalloc){
nlalloc += DELTA;
@@ -262,7 +262,7 @@ flselect(Flayer *l)
void
flsetselect(Flayer *l, long p0, long p1)
{
- ulong fp0, fp1;
+ uint64_t fp0, fp1;
l->click = 0;
if(l->visible==None || !flprepare(l)){
@@ -281,7 +281,7 @@ flsetselect(Flayer *l, long p0, long p1)
}
void
-flfp0p1(Flayer *l, ulong *pp0, ulong *pp1)
+flfp0p1(Flayer *l, uint64_t *pp0, uint64_t *pp1)
{
long p0 = l->p0-l->origin, p1 = l->p1-l->origin;
@@ -361,7 +361,7 @@ int
flprepare(Flayer *l)
{
Frame *f;
- ulong n;
+ uint64_t n;
Rune *r;
if(l->visible == None)
@@ -377,7 +377,7 @@ flprepare(Flayer *l)
n = f->nchars;
frinit(f, f->entire, f->font, f->b, l->bg);
r = (*l->textfn)(l, n, &n);
- frinsert(f, r, r+n, (ulong)0);
+ frinsert(f, r, r+n, (uint64_t)0);
frselectp(f, F&~D);
flfp0p1(l, &l->f.p0, &l->f.p1);
frselectp(f, F&~D);
(DIR) diff --git a/samterm/flayer.h b/samterm/flayer.h
@@ -22,7 +22,7 @@ struct Flayer
long origin; /* offset of first char in flayer */
long p0, p1;
long click; /* time at which selection click occurred, in HZ */
- Rune *(*textfn)(Flayer*, long, ulong*);
+ Rune *(*textfn)(Flayer*, long, uint64_t*);
int user0;
void *user1;
Rectangle entire;
@@ -33,10 +33,10 @@ struct Flayer
void flborder(Flayer*, int);
void flclose(Flayer*);
void fldelete(Flayer*, long, long);
-void flfp0p1(Flayer*, ulong*, ulong*);
+void flfp0p1(Flayer*, uint64_t*, uint64_t*);
void flinit(Flayer*, Rectangle, XftFont*, uint64_t bg);
void flinsert(Flayer*, Rune*, Rune*, long);
-void flnew(Flayer*, Rune *(*fn)(Flayer*, long, ulong*), int, void*);
+void flnew(Flayer*, Rune *(*fn)(Flayer*, long, uint64_t*), int, void*);
int flprepare(Flayer*);
Rectangle flrect(Flayer*, Rectangle);
void flrefresh(Flayer*, Rectangle, int);
(DIR) diff --git a/samterm/io.c b/samterm/io.c
@@ -66,7 +66,7 @@ externload(Event *e)
int
waitforio(void)
{
- ulong type;
+ uint64_t type;
static Event e;
if(got & ~block)
(DIR) diff --git a/samterm/main.c b/samterm/main.c
@@ -232,7 +232,7 @@ duplicate(Flayer *l, Rectangle r, XftFont *f, int close)
Text *t=(Text *)l->user1;
Flayer *nl = findl(t);
Rune *rp;
- ulong n;
+ uint64_t n;
if(nl){
flnew(nl, stgettext, l->user0, (char *)t);
@@ -367,7 +367,7 @@ alnum(int c)
int
raspc(Rasp *r, long p)
{
- ulong n;
+ uint64_t n;
rload(r, p, p+1, &n);
if(n)
return scratch[0];
@@ -444,7 +444,7 @@ void
flushtyping(int clearesc)
{
Text *t;
- ulong n;
+ uint64_t n;
if(clearesc)
typeesc = -1;
@@ -1029,7 +1029,7 @@ panic(char *s)
}
Rune*
-stgettext(Flayer *l, long n, ulong *np)
+stgettext(Flayer *l, long n, uint64_t *np)
{
Text *t;
@@ -1045,7 +1045,7 @@ scrtotal(Flayer *l)
}
void*
-alloc(ulong n)
+alloc(uint64_t n)
{
void *p;
(DIR) diff --git a/samterm/mesg.c b/samterm/mesg.c
@@ -516,7 +516,7 @@ horigin(int m, long p0, Flayer *l)
Text *t = whichtext(m);
l = l ? l : &t->l[t->front];
long a;
- ulong n;
+ uint64_t n;
Rune *r;
if (getlayer(l, t) < 0)
(DIR) diff --git a/samterm/rasp.c b/samterm/rasp.c
@@ -173,7 +173,7 @@ Strcpy(Rune *to, Rune *from)
}
Rune*
-rload(Rasp *r, ulong p0, ulong p1, ulong *nrp)
+rload(Rasp *r, uint64_t p0, uint64_t p1, uint64_t *nrp)
{
Section *s;
long p;
@@ -209,7 +209,7 @@ rload(Rasp *r, ulong p0, ulong p1, ulong *nrp)
}
int
-rmissing(Rasp *r, ulong p0, ulong p1)
+rmissing(Rasp *r, uint64_t p0, uint64_t p1)
{
Section *s;
long p;
@@ -232,7 +232,7 @@ rmissing(Rasp *r, ulong p0, ulong p1)
}
int
-rcontig(Rasp *r, ulong p0, ulong p1, int text)
+rcontig(Rasp *r, uint64_t p0, uint64_t p1, int text)
{
Section *s;
long p, n;
(DIR) diff --git a/samterm/samterm.h b/samterm/samterm.h
@@ -94,8 +94,8 @@ extern long snarflen;
extern Mouse mouse;
extern long modified;
-Rune *stgettext(Flayer*, long, ulong*);
-void *alloc(ulong n);
+Rune *stgettext(Flayer*, long, uint64_t*);
+void *alloc(uint64_t n);
void iconinit(void);
void getscreen(int, char**);
@@ -145,15 +145,15 @@ void horigin(int, long, Flayer *);
void hgrow(int, long, long, int);
int hdata(int, long, uchar*, int);
int hdatarune(int, long, Rune*, int);
-Rune *rload(Rasp*, ulong, ulong, ulong*);
+Rune *rload(Rasp*, uint64_t, uint64_t, uint64_t*);
void menuins(int, uchar*, Text*, int, int);
void menudel(int);
Text *sweeptext(int, int);
void setpat(char*);
bool haspat(void);
void scrdraw(Flayer*, long tot);
-int rcontig(Rasp*, ulong, ulong, int);
-int rmissing(Rasp*, ulong, ulong);
+int rcontig(Rasp*, uint64_t, uint64_t, int);
+int rmissing(Rasp*, uint64_t, uint64_t);
void rresize(Rasp *, long, long, long);
void rdata(Rasp*, long, long, Rune*);
void rclean(Rasp*);