Skip to content

Commit

Permalink
More white space normalisation
Browse files Browse the repository at this point in the history
  • Loading branch information
Ralph Loader committed Nov 12, 2011
1 parent 5e090e0 commit dd6f6cd
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions fixup.c
Expand Up @@ -34,8 +34,8 @@ static int compare_fixup_by_time (const void * AA, const void * BB)
}


void create_fixups(const database_t * db,
version_t * const * branch_versions, tag_t * tag)
void create_fixups (const database_t * db,
version_t * const * branch_versions, tag_t * tag)
{
// Go through the current versions on the branch and note any version
// fix-ups required.
Expand Down Expand Up @@ -166,7 +166,7 @@ void fixup_list (fixup_ver_t ** fixups, fixup_ver_t ** fixups_end,
*j++ = *i;

tag->fixups_end = j;
ARRAY_TRIM(tag->fixups);
ARRAY_TRIM (tag->fixups);
tag->fixups_curr = tag->fixups;
}

Expand Down Expand Up @@ -215,7 +215,7 @@ char * fixup_commit_comment (const database_t * db,
char * result;
size_t res_size;

FILE * f = open_memstream(&result, &res_size);
FILE * f = open_memstream (&result, &res_size);
if (f == NULL)
fatal ("open_memstream failed: %s\n", strerror (errno));

Expand Down
6 changes: 3 additions & 3 deletions fixup.h
Expand Up @@ -18,9 +18,9 @@ typedef struct fixup_ver {
/// Create the fixups for a tag (or branch). @p branch_versions is a list of
/// versions, and versions that differ on the @p tag are noted in the @p
/// tag->fixup list.
void create_fixups(const struct database * db,
struct version * const * branch_versions,
struct tag * tag);
void create_fixups (const struct database * db,
struct version * const * branch_versions,
struct tag * tag);

/// Select from the @p tag->fixups the list of @p fixups to be done before the
/// @p changeset (or all if NULL).
Expand Down
2 changes: 1 addition & 1 deletion log.c
Expand Up @@ -32,7 +32,7 @@ ssize_t check (ssize_t val, const char * f, ...)
if (val >= 0)
return val;

const char * e = strerror(errno);
const char * e = strerror (errno);

va_list l;
va_start (l, f);
Expand Down
8 changes: 4 additions & 4 deletions utils.c
Expand Up @@ -67,16 +67,16 @@ char * xasprintf (const char * format, ...)

int compare_paths (const char * A, const char * B)
{
const char * sA = strrchr(A, '/');
const char * sB = strrchr(B, '/');
const char * sA = strrchr (A, '/');
const char * sB = strrchr (B, '/');
size_t lA = sA ? sA - A + 1 : 0;
size_t lB = sB ? sB - B + 1 : 0;
int r = memcmp(A, B, lA < lB ? lA : lB);
int r = memcmp (A, B, lA < lB ? lA : lB);
if (r != 0)
return r;
if (lA != lB)
return lA < lB ? -1 : 1;
return strcmp(A + lA, B + lB);
return strcmp (A + lA, B + lB);
}


Expand Down

0 comments on commit dd6f6cd

Please sign in to comment.