# HG changeset patch
# User Abhishek Kulkarni <[EMAIL PROTECTED]>
# Date 1223199015 21600
# Node ID 66e2cc7728c349d370a94b0591a6eec51bd5c4bf
# Parent c26160cd1a42af4036e9a4edb8c04e7b003023aa
Replace all crc occurrences with checksum.
This is to avoid the confusion that we use CRC for checksumming the files.
The upcoming patches use adler-32 to calculate the checksum of a file.
Signed-off-by: Abhishek Kulkarni <[EMAIL PROTECTED]>
diff --git a/xget/xget.c b/xget/xget.c
--- a/xget/xget.c
+++ b/xget/xget.c
@@ -61,8 +61,8 @@ Spfileops log_ops = {
.write = log_write,
};
-Spfileops crc_ops = {
- .read = crc_read,
+Spfileops checksum_ops = {
+ .read = checksum_read,
};
Spcfsys *masterfs;
@@ -864,7 +864,7 @@ fsinit(void)
static File *
filealloc(Spfile *parent, char *nname, char *lname, u64 datasize, u64 datalen,
- u32 mtime, u32 crc, u32 mode, Spuser *usr, Spgroup *grp)
+ u32 mtime, u32 checksum, u32 mode, Spuser *usr, Spgroup *grp)
{
int qp;
File *f;
@@ -886,7 +886,7 @@ filealloc(Spfile *parent, char *nname, c
f->datafid = NULL;
f->availfid = NULL;
f->datafd = NULL;
- f->crc = crc;
+ f->checksum = checksum;
f->finished = 0;
f->progress = time(NULL);
f->retries = 0;
@@ -898,7 +898,7 @@ filealloc(Spfile *parent, char *nname, c
file = create_file(f->dir, "redir", 0444, (qp << 8) | Qredir,
&redir_ops, NULL, NULL, f);
file->length = 32;
- create_file(f->dir, "crc", 0444, (qp << 8) | Qcrc, &crc_ops, NULL,
NULL, f);
+ create_file(f->dir, "checksum", 0444, (qp << 8) | Qchecksum,
&checksum_ops, NULL, NULL, f);
f->next = files;
f->prev = NULL;
if (files)
@@ -918,12 +918,12 @@ localfileread(Spfile *parent, char *file
DIR *dirstr;
struct dirent *de;
int fd;
- u32 crc, npmode;
+ u32 checksum, npmode;
Spuser *usr;
Spgroup *grp;
f = NULL;
- crc = 0;
+ checksum = 0;
ret = NULL;
usr = NULL;
grp = NULL;
@@ -949,9 +949,9 @@ localfileread(Spfile *parent, char *file
goto error;
}
- crc = fcrc32(fd, st.st_size);
+ checksum = fcrc32(fd, st.st_size);
f = filealloc(parent, name, filename, st.st_size, st.st_size,
- st.st_mtime, crc, npmode, usr, grp);
+ st.st_mtime, checksum, npmode, usr, grp);
if (!f)
goto error;
@@ -1072,7 +1072,7 @@ netreadcb(Spcfd *fd, void *a)
{
int n, lfd, readsize;
File *f;
- u32 crc;
+ u32 checksum;
u8 *buf;
struct stat *st;
@@ -1128,8 +1128,8 @@ netreadcb(Spcfd *fd, void *a)
goto error;
}
- crc = fcrc32(lfd, f->datasize);
- if (crc == f->crc)
+ checksum = fcrc32(lfd, f->datasize);
+ if (checksum == f->checksum)
f->finished = 1;
else
f->finished = -1;
@@ -1155,14 +1155,14 @@ netfileread(Spfile *dir, char *lname, ch
netfileread(Spfile *dir, char *lname, char *nname, u64 len, int mtime,
u32 npmode, Spuser *usr, Spgroup *grp)
{
- int n, blen, crc;
+ int n, blen, checksum;
char *buf, *fname, *redirto;
- Spcfid *datafid, *crcfid, *availfid, *redirfid;
+ Spcfid *datafid, *checksumfid, *availfid, *redirfid;
Spcfsys *redirfs;
File *file;
datafid = NULL;
- crcfid = NULL;
+ checksumfid = NULL;
availfid = NULL;
redirfid = NULL;
redirfs = NULL;
@@ -1174,18 +1174,18 @@ netfileread(Spfile *dir, char *lname, ch
if (!buf)
return -1;
- sprintf(buf, "%s/crc", nname);
- crcfid = spc_open(masterfs, buf, Oread);
- if (!crcfid)
+ sprintf(buf, "%s/checksum", nname);
+ checksumfid = spc_open(masterfs, buf, Oread);
+ if (!checksumfid)
goto error;
- n = spc_read(crcfid, (u8 *) buf, blen, 0);
+ n = spc_read(checksumfid, (u8 *) buf, blen, 0);
if (n < 0)
goto error;
buf[n] = '\0';
- crc = strtoul(buf, NULL, 0);
- spc_close(crcfid);
+ checksum = strtoul(buf, NULL, 0);
+ spc_close(checksumfid);
fname = strrchr(nname, '/');
if (!fname)
fname = nname;
@@ -1244,7 +1244,7 @@ netfileread(Spfile *dir, char *lname, ch
file->fs = redirfs;
file->datafid = datafid;
- file->crc = crc;
+ file->checksum = checksum;
file->datafd = spcfd_add(file->datafid, netreadcb, file, 0);
file->availfid = availfid;
free(buf);
@@ -1255,8 +1255,8 @@ error:
if (datafid)
spc_close(datafid);
- if (crcfid)
- spc_close(crcfid);
+ if (checksumfid)
+ spc_close(checksumfid);
if (availfid)
spc_close(availfid);
@@ -2033,7 +2033,7 @@ data_read(Spfilefid *fid, u64 offset, u3
}
static int
-crc_read(Spfilefid *fid, u64 offset, u32 count, u8 *data, Spreq *r)
+checksum_read(Spfilefid *fid, u64 offset, u32 count, u8 *data, Spreq *r)
{
File *f;
char buf[11];
@@ -2042,7 +2042,7 @@ crc_read(Spfilefid *fid, u64 offset, u32
if (!f)
return 0;
- snprintf(buf, sizeof(buf), "%u", f->crc);
+ snprintf(buf, sizeof(buf), "%u", f->checksum);
return cutstr(data, offset, count, buf, 0);
}
diff --git a/xget/xget.h b/xget/xget.h
--- a/xget/xget.h
+++ b/xget/xget.h
@@ -7,7 +7,7 @@ enum {
Qredir,
Qlog,
Qmax,
- Qcrc,
+ Qchecksum,
Bufsize = 4192,
@@ -47,7 +47,7 @@ struct File {
Req* reqs;
File* next;
File* prev;
- u32 crc;
+ u32 checksum;
int finished;
time_t progress;
int retries;
@@ -101,7 +101,7 @@ static Spfile *dir_next(Spfile *dir, Spf
static Spfile *dir_next(Spfile *dir, Spfile *prevchild);
static Spfile *dir_first(Spfile *dir);
static void dir_destroy(Spfile *dir);
-static int crc_read(Spfilefid *fid, u64 offset, u32 count, u8 *data,
Spreq *req);
+static int checksum_read(Spfilefid *fid, u64 offset, u32 count, u8 *data,
Spreq *req);
static Spfcall *xflush(Spreq *req);
static int log_write(Spfilefid *fid, u64 offset, u32 count, u8 *data,
Spreq *req);
static int log_read(Spfilefid *fid, u64 offset, u32 count, u8 *data, Spreq
*req);
@@ -109,7 +109,7 @@ static void connclose(Spconn *conn);
static void connclose(Spconn *conn);
static Spfile *localfileread(Spfile *parent, char* filename);
static File *filealloc(Spfile *parent, char *name, char *lname,
- u64 datasize, u64 datalen, u32 mtime, u32 crc,
+ u64 datasize, u64 datalen, u32 mtime, u32 checksum,
u32 mode, Spuser *user, Spgroup *group);
static int file_finalize(File *f, int write);
u32 crc32(const void *buf, size_t size);
