author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2010-12-23 11:47:53 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2011-02-19 13:37:34 (UTC) |
commit | 6bf2658f04089179aa373e47bd1d0718e808a59b (patch) (unidiff) | |
tree | a40fb5d073f4cdf1eb81130eaed491ce58aa4af7 /ui-shared.c | |
parent | 7c2dea03674b54aa43d17a93e6e550f03759c95f (diff) | |
download | cgit-6bf2658f04089179aa373e47bd1d0718e808a59b.zip cgit-6bf2658f04089179aa373e47bd1d0718e808a59b.tar.gz cgit-6bf2658f04089179aa373e47bd1d0718e808a59b.tar.bz2 |
ui-shared: silence warning
warning: format ‘%ld’ expects type ‘long int’, but argument 2 has type
‘size_t’
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-shared.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui-shared.c b/ui-shared.c index 8a7cc32..d1b020b 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -373,193 +373,193 @@ void cgit_stats_link(char *name, char *title, char *class, char *head, | |||
373 | { | 373 | { |
374 | reporevlink("stats", name, title, class, head, NULL, path); | 374 | reporevlink("stats", name, title, class, head, NULL, path); |
375 | } | 375 | } |
376 | 376 | ||
377 | void cgit_object_link(struct object *obj) | 377 | void cgit_object_link(struct object *obj) |
378 | { | 378 | { |
379 | char *page, *shortrev, *fullrev, *name; | 379 | char *page, *shortrev, *fullrev, *name; |
380 | 380 | ||
381 | fullrev = sha1_to_hex(obj->sha1); | 381 | fullrev = sha1_to_hex(obj->sha1); |
382 | shortrev = xstrdup(fullrev); | 382 | shortrev = xstrdup(fullrev); |
383 | shortrev[10] = '\0'; | 383 | shortrev[10] = '\0'; |
384 | if (obj->type == OBJ_COMMIT) { | 384 | if (obj->type == OBJ_COMMIT) { |
385 | cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL, | 385 | cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL, |
386 | ctx.qry.head, fullrev); | 386 | ctx.qry.head, fullrev); |
387 | return; | 387 | return; |
388 | } else if (obj->type == OBJ_TREE) | 388 | } else if (obj->type == OBJ_TREE) |
389 | page = "tree"; | 389 | page = "tree"; |
390 | else if (obj->type == OBJ_TAG) | 390 | else if (obj->type == OBJ_TAG) |
391 | page = "tag"; | 391 | page = "tag"; |
392 | else | 392 | else |
393 | page = "blob"; | 393 | page = "blob"; |
394 | name = fmt("%s %s...", typename(obj->type), shortrev); | 394 | name = fmt("%s %s...", typename(obj->type), shortrev); |
395 | reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL); | 395 | reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL); |
396 | } | 396 | } |
397 | 397 | ||
398 | void cgit_print_date(time_t secs, char *format, int local_time) | 398 | void cgit_print_date(time_t secs, char *format, int local_time) |
399 | { | 399 | { |
400 | char buf[64]; | 400 | char buf[64]; |
401 | struct tm *time; | 401 | struct tm *time; |
402 | 402 | ||
403 | if (!secs) | 403 | if (!secs) |
404 | return; | 404 | return; |
405 | if(local_time) | 405 | if(local_time) |
406 | time = localtime(&secs); | 406 | time = localtime(&secs); |
407 | else | 407 | else |
408 | time = gmtime(&secs); | 408 | time = gmtime(&secs); |
409 | strftime(buf, sizeof(buf)-1, format, time); | 409 | strftime(buf, sizeof(buf)-1, format, time); |
410 | html_txt(buf); | 410 | html_txt(buf); |
411 | } | 411 | } |
412 | 412 | ||
413 | void cgit_print_age(time_t t, time_t max_relative, char *format) | 413 | void cgit_print_age(time_t t, time_t max_relative, char *format) |
414 | { | 414 | { |
415 | time_t now, secs; | 415 | time_t now, secs; |
416 | 416 | ||
417 | if (!t) | 417 | if (!t) |
418 | return; | 418 | return; |
419 | time(&now); | 419 | time(&now); |
420 | secs = now - t; | 420 | secs = now - t; |
421 | 421 | ||
422 | if (secs > max_relative && max_relative >= 0) { | 422 | if (secs > max_relative && max_relative >= 0) { |
423 | cgit_print_date(t, format, ctx.cfg.local_time); | 423 | cgit_print_date(t, format, ctx.cfg.local_time); |
424 | return; | 424 | return; |
425 | } | 425 | } |
426 | 426 | ||
427 | if (secs < TM_HOUR * 2) { | 427 | if (secs < TM_HOUR * 2) { |
428 | htmlf("<span class='age-mins'>%.0f min.</span>", | 428 | htmlf("<span class='age-mins'>%.0f min.</span>", |
429 | secs * 1.0 / TM_MIN); | 429 | secs * 1.0 / TM_MIN); |
430 | return; | 430 | return; |
431 | } | 431 | } |
432 | if (secs < TM_DAY * 2) { | 432 | if (secs < TM_DAY * 2) { |
433 | htmlf("<span class='age-hours'>%.0f hours</span>", | 433 | htmlf("<span class='age-hours'>%.0f hours</span>", |
434 | secs * 1.0 / TM_HOUR); | 434 | secs * 1.0 / TM_HOUR); |
435 | return; | 435 | return; |
436 | } | 436 | } |
437 | if (secs < TM_WEEK * 2) { | 437 | if (secs < TM_WEEK * 2) { |
438 | htmlf("<span class='age-days'>%.0f days</span>", | 438 | htmlf("<span class='age-days'>%.0f days</span>", |
439 | secs * 1.0 / TM_DAY); | 439 | secs * 1.0 / TM_DAY); |
440 | return; | 440 | return; |
441 | } | 441 | } |
442 | if (secs < TM_MONTH * 2) { | 442 | if (secs < TM_MONTH * 2) { |
443 | htmlf("<span class='age-weeks'>%.0f weeks</span>", | 443 | htmlf("<span class='age-weeks'>%.0f weeks</span>", |
444 | secs * 1.0 / TM_WEEK); | 444 | secs * 1.0 / TM_WEEK); |
445 | return; | 445 | return; |
446 | } | 446 | } |
447 | if (secs < TM_YEAR * 2) { | 447 | if (secs < TM_YEAR * 2) { |
448 | htmlf("<span class='age-months'>%.0f months</span>", | 448 | htmlf("<span class='age-months'>%.0f months</span>", |
449 | secs * 1.0 / TM_MONTH); | 449 | secs * 1.0 / TM_MONTH); |
450 | return; | 450 | return; |
451 | } | 451 | } |
452 | htmlf("<span class='age-years'>%.0f years</span>", | 452 | htmlf("<span class='age-years'>%.0f years</span>", |
453 | secs * 1.0 / TM_YEAR); | 453 | secs * 1.0 / TM_YEAR); |
454 | } | 454 | } |
455 | 455 | ||
456 | void cgit_print_http_headers(struct cgit_context *ctx) | 456 | void cgit_print_http_headers(struct cgit_context *ctx) |
457 | { | 457 | { |
458 | if (ctx->env.no_http && !strcmp(ctx->env.no_http, "1")) | 458 | if (ctx->env.no_http && !strcmp(ctx->env.no_http, "1")) |
459 | return; | 459 | return; |
460 | 460 | ||
461 | if (ctx->page.status) | 461 | if (ctx->page.status) |
462 | htmlf("Status: %d %s\n", ctx->page.status, ctx->page.statusmsg); | 462 | htmlf("Status: %d %s\n", ctx->page.status, ctx->page.statusmsg); |
463 | if (ctx->page.mimetype && ctx->page.charset) | 463 | if (ctx->page.mimetype && ctx->page.charset) |
464 | htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, | 464 | htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, |
465 | ctx->page.charset); | 465 | ctx->page.charset); |
466 | else if (ctx->page.mimetype) | 466 | else if (ctx->page.mimetype) |
467 | htmlf("Content-Type: %s\n", ctx->page.mimetype); | 467 | htmlf("Content-Type: %s\n", ctx->page.mimetype); |
468 | if (ctx->page.size) | 468 | if (ctx->page.size) |
469 | htmlf("Content-Length: %ld\n", ctx->page.size); | 469 | htmlf("Content-Length: %zd\n", ctx->page.size); |
470 | if (ctx->page.filename) | 470 | if (ctx->page.filename) |
471 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", | 471 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", |
472 | ctx->page.filename); | 472 | ctx->page.filename); |
473 | htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); | 473 | htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); |
474 | htmlf("Expires: %s\n", http_date(ctx->page.expires)); | 474 | htmlf("Expires: %s\n", http_date(ctx->page.expires)); |
475 | if (ctx->page.etag) | 475 | if (ctx->page.etag) |
476 | htmlf("ETag: \"%s\"\n", ctx->page.etag); | 476 | htmlf("ETag: \"%s\"\n", ctx->page.etag); |
477 | html("\n"); | 477 | html("\n"); |
478 | if (ctx->env.request_method && !strcmp(ctx->env.request_method, "HEAD")) | 478 | if (ctx->env.request_method && !strcmp(ctx->env.request_method, "HEAD")) |
479 | exit(0); | 479 | exit(0); |
480 | } | 480 | } |
481 | 481 | ||
482 | void cgit_print_docstart(struct cgit_context *ctx) | 482 | void cgit_print_docstart(struct cgit_context *ctx) |
483 | { | 483 | { |
484 | if (ctx->cfg.embedded) { | 484 | if (ctx->cfg.embedded) { |
485 | if (ctx->cfg.header) | 485 | if (ctx->cfg.header) |
486 | html_include(ctx->cfg.header); | 486 | html_include(ctx->cfg.header); |
487 | return; | 487 | return; |
488 | } | 488 | } |
489 | 489 | ||
490 | char *host = cgit_hosturl(); | 490 | char *host = cgit_hosturl(); |
491 | html(cgit_doctype); | 491 | html(cgit_doctype); |
492 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); | 492 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); |
493 | html("<head>\n"); | 493 | html("<head>\n"); |
494 | html("<title>"); | 494 | html("<title>"); |
495 | html_txt(ctx->page.title); | 495 | html_txt(ctx->page.title); |
496 | html("</title>\n"); | 496 | html("</title>\n"); |
497 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); | 497 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); |
498 | if (ctx->cfg.robots && *ctx->cfg.robots) | 498 | if (ctx->cfg.robots && *ctx->cfg.robots) |
499 | htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); | 499 | htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); |
500 | html("<link rel='stylesheet' type='text/css' href='"); | 500 | html("<link rel='stylesheet' type='text/css' href='"); |
501 | html_attr(ctx->cfg.css); | 501 | html_attr(ctx->cfg.css); |
502 | html("'/>\n"); | 502 | html("'/>\n"); |
503 | if (ctx->cfg.favicon) { | 503 | if (ctx->cfg.favicon) { |
504 | html("<link rel='shortcut icon' href='"); | 504 | html("<link rel='shortcut icon' href='"); |
505 | html_attr(ctx->cfg.favicon); | 505 | html_attr(ctx->cfg.favicon); |
506 | html("'/>\n"); | 506 | html("'/>\n"); |
507 | } | 507 | } |
508 | if (host && ctx->repo) { | 508 | if (host && ctx->repo) { |
509 | html("<link rel='alternate' title='Atom feed' href='"); | 509 | html("<link rel='alternate' title='Atom feed' href='"); |
510 | html(cgit_httpscheme()); | 510 | html(cgit_httpscheme()); |
511 | html_attr(cgit_hosturl()); | 511 | html_attr(cgit_hosturl()); |
512 | html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path, | 512 | html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path, |
513 | fmt("h=%s", ctx->qry.head))); | 513 | fmt("h=%s", ctx->qry.head))); |
514 | html("' type='application/atom+xml'/>\n"); | 514 | html("' type='application/atom+xml'/>\n"); |
515 | } | 515 | } |
516 | if (ctx->cfg.head_include) | 516 | if (ctx->cfg.head_include) |
517 | html_include(ctx->cfg.head_include); | 517 | html_include(ctx->cfg.head_include); |
518 | html("</head>\n"); | 518 | html("</head>\n"); |
519 | html("<body>\n"); | 519 | html("<body>\n"); |
520 | if (ctx->cfg.header) | 520 | if (ctx->cfg.header) |
521 | html_include(ctx->cfg.header); | 521 | html_include(ctx->cfg.header); |
522 | } | 522 | } |
523 | 523 | ||
524 | void cgit_print_docend() | 524 | void cgit_print_docend() |
525 | { | 525 | { |
526 | html("</div> <!-- class=content -->\n"); | 526 | html("</div> <!-- class=content -->\n"); |
527 | if (ctx.cfg.embedded) { | 527 | if (ctx.cfg.embedded) { |
528 | html("</div> <!-- id=cgit -->\n"); | 528 | html("</div> <!-- id=cgit -->\n"); |
529 | if (ctx.cfg.footer) | 529 | if (ctx.cfg.footer) |
530 | html_include(ctx.cfg.footer); | 530 | html_include(ctx.cfg.footer); |
531 | return; | 531 | return; |
532 | } | 532 | } |
533 | if (ctx.cfg.footer) | 533 | if (ctx.cfg.footer) |
534 | html_include(ctx.cfg.footer); | 534 | html_include(ctx.cfg.footer); |
535 | else { | 535 | else { |
536 | htmlf("<div class='footer'>generated by cgit %s at ", | 536 | htmlf("<div class='footer'>generated by cgit %s at ", |
537 | cgit_version); | 537 | cgit_version); |
538 | cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time); | 538 | cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time); |
539 | html("</div>\n"); | 539 | html("</div>\n"); |
540 | } | 540 | } |
541 | html("</div> <!-- id=cgit -->\n"); | 541 | html("</div> <!-- id=cgit -->\n"); |
542 | html("</body>\n</html>\n"); | 542 | html("</body>\n</html>\n"); |
543 | } | 543 | } |
544 | 544 | ||
545 | int print_branch_option(const char *refname, const unsigned char *sha1, | 545 | int print_branch_option(const char *refname, const unsigned char *sha1, |
546 | int flags, void *cb_data) | 546 | int flags, void *cb_data) |
547 | { | 547 | { |
548 | char *name = (char *)refname; | 548 | char *name = (char *)refname; |
549 | html_option(name, name, ctx.qry.head); | 549 | html_option(name, name, ctx.qry.head); |
550 | return 0; | 550 | return 0; |
551 | } | 551 | } |
552 | 552 | ||
553 | int print_archive_ref(const char *refname, const unsigned char *sha1, | 553 | int print_archive_ref(const char *refname, const unsigned char *sha1, |
554 | int flags, void *cb_data) | 554 | int flags, void *cb_data) |
555 | { | 555 | { |
556 | struct tag *tag; | 556 | struct tag *tag; |
557 | struct taginfo *info; | 557 | struct taginfo *info; |
558 | struct object *obj; | 558 | struct object *obj; |
559 | char buf[256], *url; | 559 | char buf[256], *url; |
560 | unsigned char fileid[20]; | 560 | unsigned char fileid[20]; |
561 | int *header = (int *)cb_data; | 561 | int *header = (int *)cb_data; |
562 | 562 | ||
563 | if (prefixcmp(refname, "refs/archives")) | 563 | if (prefixcmp(refname, "refs/archives")) |
564 | return 0; | 564 | return 0; |
565 | strncpy(buf, refname+14, sizeof(buf)); | 565 | strncpy(buf, refname+14, sizeof(buf)); |