From 8e85b1b2001f8d747a41e41f616d20d84bf65acc Mon Sep 17 00:00:00 2001 From: Ben Brewer Date: Thu, 29 May 2014 17:09:15 +0100 Subject: style: Cleanup the names of the tbd read/write wrappers --- tbdiff/tbdiff-apply.c | 92 +++++++++++++++++++++++++-------------------------- 1 file changed, 46 insertions(+), 46 deletions(-) (limited to 'tbdiff/tbdiff-apply.c') diff --git a/tbdiff/tbdiff-apply.c b/tbdiff/tbdiff-apply.c index 07a9961..754df5e 100644 --- a/tbdiff/tbdiff-apply.c +++ b/tbdiff/tbdiff-apply.c @@ -46,7 +46,7 @@ char* tbd_apply_fread_string(FILE *stream) { uint16_t dlen; - if(tbd_read_uint16_t(&dlen, stream) != 1) + if(tbd_read_uint16(&dlen, stream) != 1) return NULL; char dname[dlen + 1]; if(fread(dname, 1, dlen, stream) != dlen) @@ -99,7 +99,7 @@ tbd_apply_identify(FILE *stream) if(cmd != TBD_CMD_IDENTIFY) return TBD_ERROR(TBD_ERROR_INVALID_PARAMETER); uint16_t nlen; - if(tbd_read_uint16_t(&nlen, stream) != 1) + if(tbd_read_uint16(&nlen, stream) != 1) return TBD_ERROR(TBD_ERROR_UNABLE_TO_READ_STREAM); if(strlen(TB_DIFF_PROTOCOL_ID) != nlen) return TBD_ERROR(TBD_ERROR_INVALID_PARAMETER); @@ -115,7 +115,7 @@ static int tbd_apply_cmd_dir_create(FILE *stream) { uint16_t dlen; - if(tbd_read_uint16_t(&dlen, stream) != 1) + if(tbd_read_uint16(&dlen, stream) != 1) return TBD_ERROR(TBD_ERROR_UNABLE_TO_READ_STREAM); char dname[dlen + 1]; if(fread(dname, 1, dlen, stream) != dlen) @@ -126,19 +126,19 @@ tbd_apply_cmd_dir_create(FILE *stream) return TBD_ERROR(TBD_ERROR_INVALID_PARAMETER); time_t mtime; - if(tbd_read_time_t(&mtime, stream) != 1) + if(tbd_read_time(&mtime, stream) != 1) return TBD_ERROR(TBD_ERROR_UNABLE_TO_READ_STREAM); uid_t uid; - if(tbd_read_uid_t(&uid, stream) != 1) + if(tbd_read_uid(&uid, stream) != 1) return TBD_ERROR(TBD_ERROR_UNABLE_TO_READ_STREAM); gid_t gid; - if(tbd_read_gid_t(&gid, stream) != 1) + if(tbd_read_gid(&gid, stream) != 1) return TBD_ERROR(TBD_ERROR_UNABLE_TO_READ_STREAM); mode_t mode; - if(tbd_read_mode_t(&mode, stream) != 1) + if(tbd_read_mode(&mode, stream) != 1) return TBD_ERROR(TBD_ERROR_UNABLE_TO_READ_STREAM); if(mkdir(dname, (mode_t)mode) != 0) @@ -159,7 +159,7 @@ tbd_apply_cmd_dir_enter(FILE *stream, uintptr_t *depth) { uint16_t dlen; - if(tbd_read_uint16_t(&dlen, stream) != 1) + if(tbd_read_uint16(&dlen, stream) != 1) return TBD_ERROR(TBD_ERROR_UNABLE_TO_READ_STREAM); char dname[dlen + 1]; if(fread(dname, 1, dlen, stream) != dlen) @@ -183,7 +183,7 @@ tbd_apply_cmd_dir_leave(FILE *stream, int err = TBD_ERROR_SUCCESS; struct utimbuf time; - if (tbd_read_time_t(&(time.modtime), stream) != 1) { + if (tbd_read_time(&(time.modtime), stream) != 1) { return TBD_ERROR(TBD_ERROR_UNABLE_TO_READ_STREAM); } time.actime = time.modtime;/* not sure what the best atime to use is */ @@ -214,7 +214,7 @@ static int tbd_apply_cmd_file_create(FILE *stream) { uint16_t flen; - if(tbd_read_uint16_t(&flen, stream) != 1) + if(tbd_read_uint16(&flen, stream) != 1) return TBD_ERROR(TBD_ERROR_UNABLE_TO_READ_STREAM); char fname[flen + 1]; if(fread(fname, 1, flen, stream) != flen) @@ -229,11 +229,11 @@ tbd_apply_cmd_file_create(FILE *stream) gid_t gid; uint32_t fsize; - if(tbd_read_time_t (&mtime, stream) != 1 || - tbd_read_uint32_t(&mode , stream) != 1 || - tbd_read_uid_t (&uid , stream) != 1 || - tbd_read_gid_t (&gid , stream) != 1 || - tbd_read_uint32_t(&fsize, stream) != 1) + if(tbd_read_time (&mtime, stream) != 1 || + tbd_read_uint32(&mode , stream) != 1 || + tbd_read_uid (&uid , stream) != 1 || + tbd_read_gid (&gid , stream) != 1 || + tbd_read_uint32(&fsize, stream) != 1) return TBD_ERROR(TBD_ERROR_UNABLE_TO_READ_STREAM); fprintf(stderr, "cmd_file_create %s:%"PRId32"\n", fname, fsize); @@ -287,7 +287,7 @@ tbd_apply_cmd_file_delta(FILE *stream) uint16_t flen; int error; - if(tbd_read_uint16_t(&flen, stream) != 1) + if(tbd_read_uint16(&flen, stream) != 1) return TBD_ERROR(TBD_ERROR_UNABLE_TO_READ_STREAM); char fname[flen + 1]; if(fread(fname, 1, flen, stream) != flen) @@ -301,11 +301,11 @@ tbd_apply_cmd_file_delta(FILE *stream) return TBD_ERROR(TBD_ERROR_INVALID_PARAMETER); /* Reading metadata */ - if(tbd_read_uint16_t(&mdata_mask, stream) != 1 || - tbd_read_time_t (&mtime , stream) != 1 || - tbd_read_uid_t (&uid , stream) != 1 || - tbd_read_gid_t (&gid , stream) != 1 || - tbd_read_uint32_t(&mode , stream) != 1) + if(tbd_read_uint16(&mdata_mask, stream) != 1 || + tbd_read_time (&mtime , stream) != 1 || + tbd_read_uid (&uid , stream) != 1 || + tbd_read_gid (&gid , stream) != 1 || + tbd_read_uint32(&mode , stream) != 1) return TBD_ERROR(TBD_ERROR_UNABLE_TO_READ_STREAM); FILE *op = fopen(fname, "rb"); @@ -322,11 +322,11 @@ tbd_apply_cmd_file_delta(FILE *stream) } uint32_t dstart, dend; - if(tbd_read_uint32_t(&dstart, stream) != 1) { + if(tbd_read_uint32(&dstart, stream) != 1) { error = TBD_ERROR(TBD_ERROR_UNABLE_TO_READ_STREAM); goto tbd_apply_cmd_file_delta_error; } - if(tbd_read_uint32_t(&dend, stream) != 1) { + if(tbd_read_uint32(&dend, stream) != 1) { error = TBD_ERROR(TBD_ERROR_UNABLE_TO_READ_STREAM); goto tbd_apply_cmd_file_delta_error; } @@ -347,7 +347,7 @@ tbd_apply_cmd_file_delta(FILE *stream) } uint32_t fsize; - if(tbd_read_uint32_t(&fsize, stream) != 1) { + if(tbd_read_uint32(&fsize, stream) != 1) { error = TBD_ERROR(TBD_ERROR_UNABLE_TO_READ_STREAM); goto tbd_apply_cmd_file_delta_error; } @@ -478,7 +478,7 @@ static int tbd_apply_cmd_entity_delete(FILE *stream) { uint16_t elen; - if(tbd_read_uint16_t(&elen, stream) != 1) + if(tbd_read_uint16(&elen, stream) != 1) return TBD_ERROR(TBD_ERROR_UNABLE_TO_READ_STREAM); char ename[elen + 1]; if(fread(ename, 1, elen, stream) != elen) @@ -500,13 +500,13 @@ tbd_apply_cmd_symlink_create(FILE *stream) uid_t uid; gid_t gid; - if(tbd_read_time_t(&mtime, stream) != 1 || - tbd_read_uid_t(&uid , stream) != 1 || - tbd_read_gid_t(&gid , stream) != 1) + if(tbd_read_time(&mtime, stream) != 1 || + tbd_read_uid(&uid , stream) != 1 || + tbd_read_gid(&gid , stream) != 1) return TBD_ERROR(TBD_ERROR_UNABLE_TO_READ_STREAM); /* Reading link file name */ - if(tbd_read_uint16_t(&len, stream) != 1) + if(tbd_read_uint16(&len, stream) != 1) return TBD_ERROR(TBD_ERROR_UNABLE_TO_READ_STREAM); char linkname[len + 1]; @@ -515,7 +515,7 @@ tbd_apply_cmd_symlink_create(FILE *stream) return TBD_ERROR(TBD_ERROR_UNABLE_TO_READ_STREAM); /* Reading target path */ - if(tbd_read_uint16_t(&len, stream) != 1) + if(tbd_read_uint16(&len, stream) != 1) return TBD_ERROR(TBD_ERROR_UNABLE_TO_READ_STREAM); char linkpath[len+1]; linkpath[len] = '\0'; @@ -550,11 +550,11 @@ tbd_apply_cmd_special_create(FILE *stream) uint32_t dev; if(name == NULL || - tbd_read_time_t (&mtime, stream) != 1 || - tbd_read_mode_t (&mode , stream) != 1 || - tbd_read_uid_t (&uid , stream) != 1 || - tbd_read_gid_t (&gid , stream) != 1 || - tbd_read_uint32_t(&dev , stream) != 1) { + tbd_read_time (&mtime, stream) != 1 || + tbd_read_mode (&mode , stream) != 1 || + tbd_read_uid (&uid , stream) != 1 || + tbd_read_gid (&gid , stream) != 1 || + tbd_read_uint32(&dev , stream) != 1) { free(name); return TBD_ERROR(TBD_ERROR_UNABLE_TO_READ_STREAM); } @@ -585,11 +585,11 @@ tbd_apply_cmd_dir_delta(FILE *stream) gid_t gid; mode_t mode; - if(tbd_read_uint16_t(&metadata_mask, stream) != 1 || - tbd_read_time_t (&mtime , stream) != 1 || - tbd_read_uid_t (&uid , stream) != 1 || - tbd_read_gid_t (&gid , stream) != 1 || - tbd_read_uint32_t(&mode , stream) != 1) + if(tbd_read_uint16(&metadata_mask, stream) != 1 || + tbd_read_time (&mtime , stream) != 1 || + tbd_read_uid (&uid , stream) != 1 || + tbd_read_gid (&gid , stream) != 1 || + tbd_read_uint32(&mode , stream) != 1) return TBD_ERROR(TBD_ERROR_UNABLE_TO_READ_STREAM); char *dname = tbd_apply_fread_string(stream); @@ -620,11 +620,11 @@ tbd_apply_cmd_file_mdata_update(FILE *stream) gid_t gid; mode_t mode; - if(tbd_read_uint16_t(&metadata_mask, stream) != 1 || - tbd_read_time_t (&mtime , stream) != 1 || - tbd_read_uid_t (&uid , stream) != 1 || - tbd_read_gid_t (&gid , stream) != 1 || - tbd_read_uint32_t(&mode , stream) != 1) + if(tbd_read_uint16(&metadata_mask, stream) != 1 || + tbd_read_time (&mtime , stream) != 1 || + tbd_read_uid (&uid , stream) != 1 || + tbd_read_gid (&gid , stream) != 1 || + tbd_read_uint32(&mode , stream) != 1) return TBD_ERROR(TBD_ERROR_UNABLE_TO_READ_STREAM); char *dname = tbd_apply_fread_string(stream); @@ -665,7 +665,7 @@ tbd_apply_cmd_xattrs_update(FILE *stream) } /* read how many attributes to process */ - if (tbd_read_uint32_t(&count, stream) != 1) { + if (tbd_read_uint32(&count, stream) != 1) { err = TBD_ERROR(TBD_ERROR_UNABLE_TO_READ_STREAM); goto cleanup; } -- cgit v1.2.1