shithub: unionfs

Download patch

ref: 85635f91726fe61e464d78a787955a99df9eb5ae
parent: 109f580362778585ba53e83133498c7d932c8254
author: kvik <[email protected]>
date: Mon Feb 17 06:35:47 EST 2020 

Rename Fil -> F


--- a/unionfs.c
+++ b/unionfs.c
@@ -5,7 +5,7 @@
 #include <9p.h>
 
 typedef struct Union Union;
-typedef struct Fil Fil;
+typedef struct F F;
 typedef struct Ftab Ftab;
 typedef struct Fstate Fstate;
 typedef struct Qtab Qtab;
@@ -32,7 +32,7 @@
 	Qtab *next;
 };
 
-struct Fil {
+struct F {
 	Ref;
 	Dir;
 	Qtab *qtab;
@@ -42,12 +42,12 @@
 
 struct Ftab {
 	long n, sz;
-	Fil **l;
+	F **l;
 };
 
 struct Fstate {
 	int fd;
-	Fil *file;
+	F *file;
 	Ftab *ftab;
 };
 
@@ -55,7 +55,7 @@
 Union *unionlist = &u0;
 uvlong qidnext;
 Qtab *qidtab[Nqtab];
-Fil *root;
+F *root;
 
 void*
 emalloc(ulong sz)
@@ -210,10 +210,10 @@
 	p->next = n;
 }
 
-Fil*
+F*
 filenew(Dir *d)
 {
-	Fil *f;
+	F *f;
 	
 	f = emalloc(sizeof(*f));
 	f->ref = 1;
@@ -228,7 +228,7 @@
 }
 
 void
-filefree(Fil *f)
+filefree(F *f)
 {
 	if(f == root)
 		return;
@@ -284,7 +284,7 @@
 }
 
 void
-ftadd(Ftab *ft, Fil *f)
+ftadd(Ftab *ft, F *f)
 {
 	Ftab *p;
 	
@@ -309,7 +309,7 @@
 	return 0;
 }
 
-Fil*
+F*
 ftidx(Ftab *ft, long i)
 {
 	long y;
@@ -329,13 +329,13 @@
 }
 
 Fstate*
-fstatenew(Fil *f)
+fstatenew(F *f)
 {
 	Fstate *st;
 	
 	st = emalloc(sizeof(*st));
 	st->fd = -1;
-	st->file = (Fil*)copyref(f);
+	st->file = (F*)copyref(f);
 	return st;
 }
 
@@ -385,12 +385,12 @@
 	respond(r, nil);
 }
 
-Fil*
-filewalk(Fil *p, char *name)
+F*
+filewalk(F *p, char *name)
 {
 	char *path, *np;
 	Dir *d;
-	Fil *f;
+	F *f;
 	Union *u;
 	
 	np = mkpath(p->fspath, name, nil);
@@ -419,7 +419,7 @@
 char*
 walk1(Fid *fid, char *name, void *)
 {
-	Fil *p, *f;
+	F *p, *f;
 	Fstate *st;
 
 	/* not sure if needed */
@@ -461,7 +461,7 @@
 }
 
 Ftab*
-filereaddir(Fil *p)
+filereaddir(F *p)
 {
 	int fd;
 	long i, n;
@@ -468,7 +468,7 @@
 	Dir *dir, *d;
 	char *path;
 	Union *u;
-	Fil *f;
+	F *f;
 	Ftab *ft;
 
 	ft = ftnew();
@@ -504,7 +504,7 @@
 {
 	Fcall *i, *o;
 	Fstate *st;
-	Fil *f;
+	F *f;
 	
 	i = &r->ifcall;
 	o = &r->ofcall;
@@ -564,7 +564,7 @@
 	Fcall *i, *o;
 	Union *u;
 	Fstate *st;
-	Fil *f, *nf;
+	F *f, *nf;
 	
 	i = &r->ifcall;
 	o = &r->ofcall;
@@ -607,7 +607,7 @@
 fsremove(Req *r)
 {
 	Fstate *st;
-	Fil *f;
+	F *f;
 	
 	st = r->fid->aux;
 	f = st->file;
@@ -619,7 +619,7 @@
 }
 
 void
-dirfill(Dir *dir, Fil *f)
+dirfill(Dir *dir, F *f)
 {
 	*dir = f->Dir;
 	dir->qid = f->qid;
@@ -633,7 +633,7 @@
 dirgen(int i, Dir *dir, void *aux)
 {
 	Fstate *fs;
-	Fil *f;
+	F *f;
 	
 	fs = aux;
 	f = ftidx(fs->ftab, i);
@@ -648,7 +648,7 @@
 {
 	long n;
 	Fcall *i, *o;
-	Fil *f;
+	F *f;
 	Fstate *st;
 	
 	i = &r->ifcall;
@@ -700,7 +700,7 @@
 fswstat(Req *r)
 {
 	Fstate *st;
-	Fil *f;
+	F *f;
 	
 	st = r->fid->aux;
 	f = st->file;