From 1221adbb581e222cfe932fe72fded2d8613112d9 Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Mon, 23 Jul 2007 22:51:45 +0200 Subject: ui-snapshot: whitespace/formatting cleanup Introduce a #define for number of snapshot archive entries, move all decls to function entrypoint, remove some trailing whitespace and reformat a few lines. Signed-off-by: Lars Hjemli --- ui-snapshot.c | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/ui-snapshot.c b/ui-snapshot.c index f9879ed..bd34a28 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c @@ -30,7 +30,7 @@ static int write_compressed_tar_archive(struct archiver_args *args,const char *f /* parent */ chk_zero(close(rw[0]), "Closing read end of pipe"); chk_non_negative(dup2(rw[1],STDOUT_FILENO), "Redirecting output to compressor"); - + rv = write_tar_archive(args); chk_zero(close(STDOUT_FILENO), "Closing STDOUT redirected to compressor"); @@ -48,6 +48,7 @@ static int write_tar_gzip_archive(struct archiver_args *args) { return write_compressed_tar_archive(args,"gzip"); } + static int write_tar_bzip2_archive(struct archiver_args *args) { return write_compressed_tar_archive(args,"bzip2"); @@ -65,27 +66,25 @@ static const struct snapshot_archive_t { { ".tar", "application/x-tar", write_tar_archive, 0x8 } }; +#define snapshot_archives_len (sizeof(snapshot_archives) / sizeof(*snapshot_archives)) + void cgit_print_snapshot(struct cacheitem *item, const char *head, const char *hex, const char *prefix, const char *filename, int snapshots) { - int fnl = strlen(filename); - int f, n; - - n = sizeof(snapshot_archives) / sizeof(*snapshot_archives); - for(f=0; fbit)) continue; sl = strlen(sat->suffix); if(fnlsuffix)) continue; - - struct archiver_args args; - struct commit *commit; - unsigned char sha1[20]; - if (!hex) hex = head; if(get_sha1(hex, sha1)) { @@ -93,16 +92,13 @@ void cgit_print_snapshot(struct cacheitem *item, const char *head, return; } commit = lookup_commit_reference(sha1); - if(!commit) { cgit_print_error(fmt("Not a commit reference: %s", hex)); return;; } - memset(&args,0,sizeof(args)); args.base = fmt("%s/", prefix); args.tree = commit->tree; - cgit_print_snapshot_start(sat->mimetype, filename, item); (*sat->write_func)(&args); return; @@ -113,12 +109,12 @@ void cgit_print_snapshot(struct cacheitem *item, const char *head, void cgit_print_snapshot_links(const char *repo, const char *head, const char *hex, int snapshots) { + const struct snapshot_archive_t* sat; char *filename; - int f, n; + int f; - n = sizeof(snapshot_archives) / sizeof(*snapshot_archives); - for(f=0; fbit)) continue; filename = fmt("%s-%s%s", cgit_repobasename(repo), hex, @@ -131,18 +127,22 @@ void cgit_print_snapshot_links(const char *repo, const char *head, int cgit_parse_snapshots_mask(const char *str) { + const struct snapshot_archive_t* sat; static const char *delim = " \t,:/|;"; int f, tl, rv = 0; + /* favor legacy setting */ - if(atoi(str)) return 1; + if(atoi(str)) + return 1; for(;;) { str += strspn(str,delim); tl = strcspn(str,delim); if(!tl) break; - for(f=0;f<(sizeof(snapshot_archives)/sizeof(*snapshot_archives));++f) { - const struct snapshot_archive_t* sat = &snapshot_archives[f]; - if(! ( strncmp(sat->suffix,str,tl) && strncmp(sat->suffix+1,str,tl-1) ) ) { + for(f=0; fsuffix, str, tl) && + strncmp(sat->suffix+1, str, tl-1))) { rv |= sat->bit; break; } -- cgit 1.4.1 d>June McEnroe 2019-03-14Add The Long Way to a Small Angry PlanetJune McEnroe 2019-03-10Add Bleachers Tiny Desk ConcertJune McEnroe 2019-02-28Add Station ElevenJune McEnroe 2019-02-27Use getsubopt(3) to parse -o options in hiJune McEnroe 2019-02-27Add type and ulimit shell keywordsJune McEnroe 2019-02-27Fix make target pattern whitespace in hiJune McEnroe 2019-02-27Delete extraneous <pre> in html.shJune McEnroe 2019-02-24Use setopt in upJune McEnroe 2019-02-24Add setoptJune McEnroe 2019-02-20Match make targets as TagJune McEnroe 2019-02-20Use $PWD in html.sh to pass absolute path to manJune McEnroe 2019-02-20Factor out html.sh and produce html for all sourcesJune McEnroe Except for gfx-cocoa because I don't have an Objective-C highlighter. Also hypothetically the .h rule could match up headers with .3 manual pages if I cared to write them. 2019-02-20Add Dirk Gently's Holistic Detective AgencyJune McEnroe 2019-02-20Move /opt/pkg after /usr in PATHJune McEnroe Installing mandoc from pkgsrc also installs a man executable which is horribly broken. Keep using the system man. 2019-02-20Set man_hard_wrap in nvimJune McEnroe Vendoring man.vim until <https://github.com/neovim/neovim/pull/9633> is merged and appears in a release. 2019-02-18Use hi -o anchor in upJune McEnroe 2019-02-18Don't match nested parentheses in Tag for CJune McEnroe Fixes mistaken highlight of: pngWrite(file, (uint8_t []) { 0, 0, 0 }, 3); 2019-02-18Match whitespace between * [] {}June McEnroe 2019-02-18Fix function-like #define regexJune McEnroe A define like #define FOO (1) is not function-like. 2019-02-18Match Tag in RustJune McEnroe 2019-02-18Match sh functions as TagJune McEnroe 2019-02-18Match Sh and Ss as Tag in mdocJune McEnroe 2019-02-18Match statics and typedefs as TagJune McEnroe 2019-02-18Clean up htmlHeaderJune McEnroe 2019-02-18Remove hi line numberingJune McEnroe Tags are much better for referring to specific parts of a file and line numbering is better done by a post-processing tool such as cat -n or producing a two-column HTML <table>. 2019-02-18Add Tag class to hiJune McEnroe 2019-02-17Generate HTML with hi -n -f html -o anchorJune McEnroe Running hi twice to insert stuff between the head and the content is a bit of a hack but oh well. 2019-02-17Add hi -f html -o anchor for line number linksJune McEnroe 2019-02-17Simplify temp trap in upJune McEnroe 2019-02-17Add line numbers to hiJune McEnroe Renames previous -n option to -m to stay consistent with cat -n. Prefixing lines with line numbers affects where the first tab indent ends up relative to the text above it. Not sure if it's worth fixing somehow. 2019-02-17Always split spans after newlinesJune McEnroe Simplifies ANSI and IRC output code, and prepares for line numbered output. 2019-02-15Color format specifiers light cyan in vimJune McEnroe 2019-02-15Highlight Interp as yellowJune McEnroe 2019-02-15Highlight strings in sh command substitutionsJune McEnroe 2019-02-15Add nmap gpJune McEnroe 2019-02-14Avoid newline when copying URL to pasteboardJune McEnroe 2019-02-13Add forgotten "sixth" book of H2G2June McEnroe