author | Lars Hjemli <hjemli@gmail.com> | 2007-09-19 21:46:59 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-09-19 21:46:59 (UTC) |
commit | 63d5f5eaeadf060a0c8c94ac3b32e51b469b6af3 (patch) (unidiff) | |
tree | d6b31c994f861579e6d7085ba52a41a37cd69868 /ui-tree.c | |
parent | 7921572fb1fd28ec7523fcf5ed03eaf8a3432e65 (diff) | |
download | cgit-63d5f5eaeadf060a0c8c94ac3b32e51b469b6af3.zip cgit-63d5f5eaeadf060a0c8c94ac3b32e51b469b6af3.tar.gz cgit-63d5f5eaeadf060a0c8c94ac3b32e51b469b6af3.tar.bz2 |
ui-tree: specify parameter position for all htmlf formats
The GNU C library manual tells us that behavior is undefined if only
some formats has a specification for the parameter position.
Noticed-by: <mkraai@beckman.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -14,65 +14,65 @@ int header = 0; | |||
14 | 14 | ||
15 | static void print_object(const unsigned char *sha1, char *path) | 15 | static void print_object(const unsigned char *sha1, char *path) |
16 | { | 16 | { |
17 | enum object_type type; | 17 | enum object_type type; |
18 | unsigned char *buf; | 18 | unsigned char *buf; |
19 | unsigned long size, lineno, start, idx; | 19 | unsigned long size, lineno, start, idx; |
20 | 20 | ||
21 | type = sha1_object_info(sha1, &size); | 21 | type = sha1_object_info(sha1, &size); |
22 | if (type == OBJ_BAD) { | 22 | if (type == OBJ_BAD) { |
23 | cgit_print_error(fmt("Bad object name: %s", | 23 | cgit_print_error(fmt("Bad object name: %s", |
24 | sha1_to_hex(sha1))); | 24 | sha1_to_hex(sha1))); |
25 | return; | 25 | return; |
26 | } | 26 | } |
27 | 27 | ||
28 | buf = read_sha1_file(sha1, &type, &size); | 28 | buf = read_sha1_file(sha1, &type, &size); |
29 | if (!buf) { | 29 | if (!buf) { |
30 | cgit_print_error(fmt("Error reading object %s", | 30 | cgit_print_error(fmt("Error reading object %s", |
31 | sha1_to_hex(sha1))); | 31 | sha1_to_hex(sha1))); |
32 | return; | 32 | return; |
33 | } | 33 | } |
34 | 34 | ||
35 | html(" blob: <a href='"); | 35 | html(" blob: <a href='"); |
36 | html_attr(cgit_pageurl(cgit_query_repo, "blob", fmt("id=%s", sha1_to_hex(sha1)))); | 36 | html_attr(cgit_pageurl(cgit_query_repo, "blob", fmt("id=%s", sha1_to_hex(sha1)))); |
37 | htmlf("'>%s</a>",sha1_to_hex(sha1)); | 37 | htmlf("'>%s</a>",sha1_to_hex(sha1)); |
38 | 38 | ||
39 | html("<table class='blob'>\n"); | 39 | html("<table class='blob'>\n"); |
40 | idx = 0; | 40 | idx = 0; |
41 | start = 0; | 41 | start = 0; |
42 | lineno = 0; | 42 | lineno = 0; |
43 | while(idx < size) { | 43 | while(idx < size) { |
44 | if (buf[idx] == '\n') { | 44 | if (buf[idx] == '\n') { |
45 | buf[idx] = '\0'; | 45 | buf[idx] = '\0'; |
46 | htmlf("<tr><td class='no'><a name='%d'>%1$d</a></td><td class='txt'>", | 46 | htmlf("<tr><td class='no'><a name='%1$d'>%1$d</a></td><td class='txt'>", |
47 | ++lineno); | 47 | ++lineno); |
48 | html_txt(buf + start); | 48 | html_txt(buf + start); |
49 | html("</td></tr>\n"); | 49 | html("</td></tr>\n"); |
50 | start = idx + 1; | 50 | start = idx + 1; |
51 | } | 51 | } |
52 | idx++; | 52 | idx++; |
53 | } | 53 | } |
54 | html("</table>\n"); | 54 | html("</table>\n"); |
55 | } | 55 | } |
56 | 56 | ||
57 | 57 | ||
58 | static int ls_item(const unsigned char *sha1, const char *base, int baselen, | 58 | static int ls_item(const unsigned char *sha1, const char *base, int baselen, |
59 | const char *pathname, unsigned int mode, int stage) | 59 | const char *pathname, unsigned int mode, int stage) |
60 | { | 60 | { |
61 | char *name; | 61 | char *name; |
62 | char *fullpath; | 62 | char *fullpath; |
63 | enum object_type type; | 63 | enum object_type type; |
64 | unsigned long size = 0; | 64 | unsigned long size = 0; |
65 | 65 | ||
66 | name = xstrdup(pathname); | 66 | name = xstrdup(pathname); |
67 | fullpath = fmt("%s%s%s", cgit_query_path ? cgit_query_path : "", | 67 | fullpath = fmt("%s%s%s", cgit_query_path ? cgit_query_path : "", |
68 | cgit_query_path ? "/" : "", name); | 68 | cgit_query_path ? "/" : "", name); |
69 | 69 | ||
70 | type = sha1_object_info(sha1, &size); | 70 | type = sha1_object_info(sha1, &size); |
71 | if (type == OBJ_BAD && !S_ISGITLINK(mode)) { | 71 | if (type == OBJ_BAD && !S_ISGITLINK(mode)) { |
72 | htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>", | 72 | htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>", |
73 | name, | 73 | name, |
74 | sha1_to_hex(sha1)); | 74 | sha1_to_hex(sha1)); |
75 | return 0; | 75 | return 0; |
76 | } | 76 | } |
77 | 77 | ||
78 | html("<tr><td class='ls-mode'>"); | 78 | html("<tr><td class='ls-mode'>"); |