Skip to content

Commit

Permalink
Add space after if statement
Browse files Browse the repository at this point in the history 
Signed-off-by: Jonathan Dieter <jdieter@gmail.com>
  • Loading branch information
@jdieter @kontura
jdieter authored and kontura committed Feb 4, 2019
1 parent 104ebc1 commit 6110de5
Show file tree
Hide file tree
Showing 12 changed files with 84 additions and 84 deletions.
2 changes: 1 addition & 1 deletion src/cmd_parser.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@ check_arguments(struct CmdOptions *options,
}

// Zchunk options
if(options->zck_dict_dir && !options->zck_compression) {
if (options->zck_dict_dir && !options->zck_compression) {
g_set_error(err, ERR_DOMAIN, CRE_BADARG,
"Cannot use --zck-dict-dir without setting --zck");
return FALSE;
Expand Down
40 changes: 20 additions & 20 deletions src/compression_wrapper.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,18 +296,18 @@ cr_ChecksumType
cr_cktype_from_zck(zckCtx *zck, GError **err)
{
int cktype = zck_get_full_hash_type(zck);
if(cktype < 0) {
if (cktype < 0) {
g_set_error(err, ERR_DOMAIN, CRE_ZCK,
"Unable to read hash from zchunk file");
return CR_CHECKSUM_UNKNOWN;
}
if(cktype == ZCK_HASH_SHA1)
if (cktype == ZCK_HASH_SHA1)
return CR_CHECKSUM_SHA1;
else if(cktype == ZCK_HASH_SHA256)
else if (cktype == ZCK_HASH_SHA256)
return CR_CHECKSUM_SHA256;
else {
const char *ckname = zck_hash_name_from_type(cktype);
if(ckname == NULL)
if (ckname == NULL)
ckname = "Unknown";
g_set_error(err, ERR_DOMAIN, CRE_ZCK,
"Unknown zchunk checksum type: %s", ckname);
Expand Down Expand Up @@ -600,7 +600,7 @@ cr_sopen(const char *filename,
file->FILE = (void *) zck_create();
zckCtx *zck = file->FILE;
if (mode == CR_CW_MODE_WRITE) {
if(!file->FILE || !zck_init_write(zck, fd) ||
if (!file->FILE || !zck_init_write(zck, fd) ||
!zck_set_ioption(zck, ZCK_MANUAL_CHUNK, 1)) {
zck_set_log_fd(STDOUT_FILENO);
g_set_error(err, ERR_DOMAIN, CRE_IO, "%s",
Expand Down Expand Up @@ -654,18 +654,18 @@ cr_sopen(const char *filename,

#ifdef WITH_ZCHUNK
/* Fill zchunk header_stat with header information */
if(mode == CR_CW_MODE_READ && type == CR_CW_ZCK_COMPRESSION) {
if (mode == CR_CW_MODE_READ && type == CR_CW_ZCK_COMPRESSION) {
zckCtx *zck = (zckCtx *)file->FILE;
cr_ChecksumType cktype = cr_cktype_from_zck(zck, err);
if(cktype == CR_CHECKSUM_UNKNOWN) {
if (cktype == CR_CHECKSUM_UNKNOWN) {
/* Error is already set in cr_cktype_from_zck */
g_free(file);
return NULL;
}
file->stat->hdr_checksum_type = cktype;
file->stat->hdr_checksum = zck_get_header_digest(zck);
file->stat->hdr_size = zck_get_header_length(zck);
if(*err != NULL || file->stat->hdr_checksum == NULL ||
if (*err != NULL || file->stat->hdr_checksum == NULL ||
file->stat->hdr_size < 0) {
g_free(file);
return NULL;
Expand All @@ -685,7 +685,7 @@ cr_set_dict(CR_FILE *cr_file, const void *dict, unsigned int len, GError **err)
int ret = CRE_OK;
assert(!err || *err == NULL);

if(len == 0)
if (len == 0)
return CRE_OK;

switch (cr_file->type) {
Expand All @@ -694,7 +694,7 @@ cr_set_dict(CR_FILE *cr_file, const void *dict, unsigned int len, GError **err)
#ifdef WITH_ZCHUNK
zckCtx *zck = (zckCtx *)cr_file->FILE;
size_t wlen = (size_t)len;
if(!zck_set_soption(zck, ZCK_COMP_DICT, dict, wlen)) {
if (!zck_set_soption(zck, ZCK_COMP_DICT, dict, wlen)) {
ret = CRE_ERROR;
g_set_error(err, ERR_DOMAIN, CRE_ZCK,
"Error setting dict");
Expand Down Expand Up @@ -815,7 +815,7 @@ cr_close(CR_FILE *cr_file, GError **err)

rc = lzma_code(stream, LZMA_FINISH);

if(rc != LZMA_OK && rc != LZMA_STREAM_END) {
if (rc != LZMA_OK && rc != LZMA_STREAM_END) {
// Error while coding
const char *err_msg;

Expand Down Expand Up @@ -860,7 +860,7 @@ cr_close(CR_FILE *cr_file, GError **err)
break;
}

if(rc == LZMA_STREAM_END) {
if (rc == LZMA_STREAM_END) {
// Everything all right
ret = CRE_OK;
break;
Expand All @@ -880,7 +880,7 @@ cr_close(CR_FILE *cr_file, GError **err)
zckCtx *zck = (zckCtx *) cr_file->FILE;
ret = CRE_OK;
if (cr_file->mode == CR_CW_MODE_WRITE) {
if(zck_end_chunk(zck) < 0) {
if (zck_end_chunk(zck) < 0) {
ret = CRE_ZCK;
g_set_error(err, ERR_DOMAIN, CRE_ZCK,
"Unable to end final chunk: %s", zck_get_error(zck));
Expand All @@ -892,15 +892,15 @@ cr_close(CR_FILE *cr_file, GError **err)
"Unable to close zchunk file: %s", zck_get_error(zck));
}
cr_ChecksumType cktype = cr_cktype_from_zck(zck, err);
if(cktype == CR_CHECKSUM_UNKNOWN) {
if (cktype == CR_CHECKSUM_UNKNOWN) {
/* Error is already set in cr_cktype_from_zck */
break;
}
if(cr_file->stat) {
if (cr_file->stat) {
cr_file->stat->hdr_checksum_type = cktype;
cr_file->stat->hdr_checksum = zck_get_header_digest(zck);
cr_file->stat->hdr_size = zck_get_header_length(zck);
if((err && *err) || cr_file->stat->hdr_checksum == NULL ||
if ((err && *err) || cr_file->stat->hdr_checksum == NULL ||
cr_file->stat->hdr_size < 0) {
ret = CRE_ZCK;
g_set_error(err, ERR_DOMAIN, CRE_ZCK,
Expand Down Expand Up @@ -1121,7 +1121,7 @@ cr_read(CR_FILE *cr_file, void *buffer, unsigned int len, GError **err)
#ifdef WITH_ZCHUNK
zckCtx *zck = (zckCtx *) cr_file->FILE;
ssize_t rb = zck_read(zck, buffer, len);
if(rb < 0) {
if (rb < 0) {
ret = CR_CW_ERR;
g_set_error(err, ERR_DOMAIN, CRE_ZCK, "ZCK: Unable to read: %s",
zck_get_error(zck));
Expand Down Expand Up @@ -1307,7 +1307,7 @@ cr_write(CR_FILE *cr_file, const void *buffer, unsigned int len, GError **err)
#ifdef WITH_ZCHUNK
zckCtx *zck = (zckCtx *) cr_file->FILE;
ssize_t wb = zck_write(zck, buffer, len);
if(wb < 0) {
if (wb < 0) {
ret = CR_CW_ERR;
g_set_error(err, ERR_DOMAIN, CRE_ZCK,
"ZCK: Unable to write: %s", zck_get_error(zck));
Expand Down Expand Up @@ -1403,7 +1403,7 @@ cr_end_chunk(CR_FILE *cr_file, GError **err)
#ifdef WITH_ZCHUNK
zckCtx *zck = (zckCtx *) cr_file->FILE;
ssize_t wb = zck_end_chunk(zck);
if(wb < 0) {
if (wb < 0) {
g_set_error(err, ERR_DOMAIN, CRE_ZCK,
"Error ending chunk: %s",
zck_get_error(zck));
Expand Down Expand Up @@ -1454,7 +1454,7 @@ cr_set_autochunk(CR_FILE *cr_file, gboolean auto_chunk, GError **err)
case (CR_CW_ZCK_COMPRESSION): { // ------------------------------------
#ifdef WITH_ZCHUNK
zckCtx *zck = (zckCtx *) cr_file->FILE;
if(!zck_set_ioption(zck, ZCK_MANUAL_CHUNK, !auto_chunk)) {
if (!zck_set_ioption(zck, ZCK_MANUAL_CHUNK, !auto_chunk)) {
g_set_error(err, ERR_DOMAIN, CRE_ZCK,
"Error setting auto_chunk: %s",
zck_get_error(zck));
Expand Down
20 changes: 10 additions & 10 deletions src/createrepo_c.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -837,36 +837,36 @@ main(int argc, char **argv)
gchar *fil_dict_file = NULL;
gchar *oth_dict_file = NULL;

if(cmd_options->zck_dict_dir) {
if (cmd_options->zck_dict_dir) {
pri_dict_file = cr_get_dict_file(cmd_options->zck_dict_dir,
"primary.xml");
fil_dict_file = cr_get_dict_file(cmd_options->zck_dict_dir,
"filelists.xml");
oth_dict_file = cr_get_dict_file(cmd_options->zck_dict_dir,
"other.xml");
if(pri_dict_file && !g_file_get_contents(pri_dict_file, &pri_dict,
if (pri_dict_file && !g_file_get_contents(pri_dict_file, &pri_dict,
&pri_dict_size, &tmp_err)) {
g_critical("Error reading zchunk primary dict %s: %s",
pri_dict_file, tmp_err->message);
g_clear_error(&tmp_err);
exit(EXIT_FAILURE);
}
if(fil_dict_file && !g_file_get_contents(fil_dict_file, &fil_dict,
if (fil_dict_file && !g_file_get_contents(fil_dict_file, &fil_dict,
&fil_dict_size, &tmp_err)) {
g_critical("Error reading zchunk filelists dict %s: %s",
fil_dict_file, tmp_err->message);
g_clear_error(&tmp_err);
exit(EXIT_FAILURE);
}
if(oth_dict_file && !g_file_get_contents(oth_dict_file, &oth_dict,
if (oth_dict_file && !g_file_get_contents(oth_dict_file, &oth_dict,
&oth_dict_size, &tmp_err)) {
g_critical("Error reading zchunk other dict %s: %s",
oth_dict_file, tmp_err->message);
g_clear_error(&tmp_err);
exit(EXIT_FAILURE);
}
}
if(cmd_options->zck_compression) {
if (cmd_options->zck_compression) {
g_debug("Creating .xml.zck files");

pri_zck_filename = g_strconcat(tmp_out_repo, "/primary.xml.zck", NULL);
Expand Down Expand Up @@ -1013,7 +1013,7 @@ main(int argc, char **argv)
g_thread_pool_free(pool, FALSE, TRUE);

// if there were any errors, exit nonzero
if( cmd_options->error_exit_val && user_data.had_errors ) {
if ( cmd_options->error_exit_val && user_data.had_errors ) {
exit_val = 2;
}

Expand Down Expand Up @@ -1253,7 +1253,7 @@ main(int argc, char **argv)
}

// Zchunk
if(cmd_options->zck_compression) {
if (cmd_options->zck_compression) {
// Prepare repomd records
pri_zck_rec = cr_repomd_record_new("primary_zck", pri_zck_filename);
fil_zck_rec = cr_repomd_record_new("filelists_zck", fil_zck_filename);
Expand Down Expand Up @@ -1318,7 +1318,7 @@ main(int argc, char **argv)
exit(EXIT_FAILURE);
}
/* Only create updateinfo_zck if updateinfo isn't already zchunk */
if(com_type != CR_CW_ZCK_COMPRESSION) {
if (com_type != CR_CW_ZCK_COMPRESSION) {
updateinfo_zck_rec = cr_repomd_record_new("updateinfo_zck", updateinfo);
cr_repomd_record_compress_and_fill(updateinfo_rec,
updateinfo_zck_rec,
Expand Down Expand Up @@ -1409,7 +1409,7 @@ main(int argc, char **argv)
g_clear_error(&tmp_err);
goto deltaerror;
}
if(cmd_options->zck_compression && prestodelta_compression != CR_CW_ZCK_COMPRESSION) {
if (cmd_options->zck_compression && prestodelta_compression != CR_CW_ZCK_COMPRESSION) {
filename = g_strconcat("prestodelta.xml",
cr_compression_suffix(CR_CW_ZCK_COMPRESSION),
NULL);
Expand Down Expand Up @@ -1455,7 +1455,7 @@ main(int argc, char **argv)
prestodelta_rec = cr_repomd_record_new("prestodelta", prestodelta_xml_filename);
cr_repomd_record_load_contentstat(prestodelta_rec, prestodelta_stat);
cr_repomd_record_fill(prestodelta_rec, cmd_options->repomd_checksum_type, NULL);
if(prestodelta_zck_stat) {
if (prestodelta_zck_stat) {
prestodelta_zck_rec = cr_repomd_record_new("prestodelta_zck", prestodelta_zck_filename);
cr_repomd_record_load_contentstat(prestodelta_zck_rec, prestodelta_zck_stat);
cr_repomd_record_fill(prestodelta_zck_rec, cmd_options->repomd_checksum_type, NULL);
Expand Down
2 changes: 1 addition & 1 deletion src/deltarpms.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -920,7 +920,7 @@ cr_deltarpms_generate_prestodelta_file(const gchar *drpmsdir,
cr_xmlfile_add_chunk(f, chunk, NULL);

/* Write out zchunk file */
if(zck_f) {
if (zck_f) {
cr_xmlfile_add_chunk(zck_f, chunk, NULL);
cr_end_chunk(zck_f->f, &tmp_err);
if (tmp_err) {
Expand Down
10 changes: 5 additions & 5 deletions src/dumper_thread.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ write_pkg(long id,
udata->prev_srpm = udata->cur_srpm;
udata->cur_srpm = g_strdup(pkg->rpm_sourcerpm);
gboolean new_pkg = FALSE;
if(g_strcmp0(udata->prev_srpm, udata->cur_srpm) != 0)
if (g_strcmp0(udata->prev_srpm, udata->cur_srpm) != 0)
new_pkg = TRUE;

++udata->id_pri;
Expand All @@ -100,8 +100,8 @@ write_pkg(long id,
g_clear_error(&tmp_err);
}
}
if(udata->pri_zck) {
if(new_pkg) {
if (udata->pri_zck) {
if (new_pkg) {
cr_end_chunk(udata->pri_zck->f, &tmp_err);
if (tmp_err) {
g_critical("Unable to end primary zchunk: %s", tmp_err->message);
Expand Down Expand Up @@ -144,7 +144,7 @@ write_pkg(long id,
}
}
if (udata->fil_zck) {
if(new_pkg) {
if (new_pkg) {
cr_end_chunk(udata->fil_zck->f, &tmp_err);
if (tmp_err) {
g_critical("Unable to end filelists zchunk: %s", tmp_err->message);
Expand Down Expand Up @@ -187,7 +187,7 @@ write_pkg(long id,
}
}
if (udata->oth_zck) {
if(new_pkg) {
if (new_pkg) {
cr_end_chunk(udata->oth_zck->f, &tmp_err);
if (tmp_err) {
g_critical("Unable to end other zchunk: %s", tmp_err->message);
Expand Down
2 changes: 1 addition & 1 deletion src/locate_metadata.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ cr_get_remote_metadata(const char *repopath, gboolean ignore_sqlite)

// Create temporary repo in /tmp
tmp_dir = g_build_filename(g_get_tmp_dir(), TMPDIR_PATTERN, NULL);
if(!mkdtemp(tmp_dir)) {
if (!mkdtemp(tmp_dir)) {
g_critical("%s: Cannot create a temporary directory: %s",
__func__, g_strerror(errno));
return ret;
Expand Down
Loading

0 comments on commit 6110de5

Please sign in to comment.