You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
86 lines
2.2 KiB
86 lines
2.2 KiB
Fix some gcc warnings.
|
|
|
|
Index: man-1.6g/man2html/cgibase.c
|
|
===================================================================
|
|
--- man-1.6g.orig/man2html/cgibase.c 2011-01-09 17:49:52.000000000 +0100
|
|
+++ man-1.6g/man2html/cgibase.c 2011-01-09 17:51:03.000000000 +0100
|
|
@@ -82,13 +82,13 @@
|
|
{
|
|
char timebuf[TIMEBUFSZ];
|
|
struct tm *timetm;
|
|
- time_t clock;
|
|
+ time_t now;
|
|
|
|
timebuf[0] = 0;
|
|
#ifdef TIMEFORMAT
|
|
sprintf(timebuf, "Time: ");
|
|
- clock=time(NULL);
|
|
- timetm=gmtime(&clock);
|
|
+ now=time(NULL);
|
|
+ timetm=gmtime(&now);
|
|
strftime(timebuf+6, TIMEBUFSZ-6, TIMEFORMAT, timetm);
|
|
timebuf[TIMEBUFSZ-1] = 0;
|
|
#endif
|
|
Index: man-1.6g/man2html/man2html.c
|
|
===================================================================
|
|
--- man-1.6g.orig/man2html/man2html.c 2011-01-09 17:49:52.000000000 +0100
|
|
+++ man-1.6g/man2html/man2html.c 2011-01-09 17:54:37.000000000 +0100
|
|
@@ -644,7 +644,7 @@
|
|
*tmp = 0;
|
|
|
|
for (i = 0; ((h = argument[i])); i++) {
|
|
- sprintf(tmp, "%s %s%s%s", tmp,
|
|
+ sprintf(tmp + strlen(tmp), " %s%s%s",
|
|
quote ? "\"" : "",
|
|
h,
|
|
quote ? "\"" : "");
|
|
@@ -1720,12 +1720,12 @@
|
|
for (i=1; i<words; i++)
|
|
wordlist[i][-1]=0;
|
|
for (i=0; i<words; i++) {
|
|
- char *h=NULL;
|
|
+ char *hl=NULL;
|
|
if (mandoc_command)
|
|
- scan_troff_mandoc(wordlist[i],1,&h);
|
|
+ scan_troff_mandoc(wordlist[i],1,&hl);
|
|
else
|
|
- scan_troff(wordlist[i],2,&h);
|
|
- wordlist[i]=h;
|
|
+ scan_troff(wordlist[i],2,&hl);
|
|
+ wordlist[i]=hl;
|
|
}
|
|
for (i=words; i<SIZE(wordlist); i++)
|
|
wordlist[i]=NULL;
|
|
@@ -1806,24 +1806,24 @@
|
|
single_escape=1;
|
|
curpos=0;
|
|
if (!de) {
|
|
- char *h;
|
|
+ char *hl;
|
|
de=(STRDEF*) xmalloc(sizeof(STRDEF));
|
|
de->nr=i;
|
|
de->slen=0;
|
|
de->next=strdef;
|
|
de->st=NULL;
|
|
strdef=de;
|
|
- h=NULL;
|
|
- c=scan_troff(c, 1, &h);
|
|
- de->st=h;
|
|
+ hl=NULL;
|
|
+ c=scan_troff(c, 1, &hl);
|
|
+ de->st=hl;
|
|
de->slen=curpos;
|
|
} else {
|
|
if (mode) { /* .ds */
|
|
- char *h=NULL;
|
|
- c=scan_troff(c, 1, &h);
|
|
+ char *hl=NULL;
|
|
+ c=scan_troff(c, 1, &hl);
|
|
free(de->st); /* segfault XXX */
|
|
de->slen=curpos;
|
|
- de->st=h;
|
|
+ de->st=hl;
|
|
} else { /* .as */
|
|
c=scan_troff(c,1,&de->st); /* XXX */
|
|
de->slen+=curpos;
|