Attachment 191755 Details for Bug 226799 – [patch] clean up all remaining compilation warnings

[patch] [patch] clean up all remaining compilation warnings

ical-2.2_6.diff (text/plain), 13.50 KB, created by J.R. Oldroyd on 2018-03-23 16:26:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: J.R. Oldroyd

Created: 2018-03-23 16:26:48 UTC

Size: 13.50 KB

patch

obsolete

>diff -ruN deskutils/ical-2.2_5/Makefile deskutils/ical-2.2_6/Makefile
>--- deskutils/ical-2.2_5/Makefile	2018-03-21 16:51:57.878442000 -0400
>+++ deskutils/ical-2.2_6/Makefile	2018-03-23 11:39:09.184292000 -0400
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	ical
> PORTVERSION=	2.2
>-PORTREVISION=	5
>+PORTREVISION=	6
> CATEGORIES=	deskutils tk
> MASTER_SITES=	ftp://ftp.sunet.se/pub/vendor/sco/skunkware/src/shellutil/
> 
>diff -ruN deskutils/ical-2.2_5/files/patch-cal_tcl.C deskutils/ical-2.2_6/files/patch-cal_tcl.C
>--- deskutils/ical-2.2_5/files/patch-cal_tcl.C	2018-02-15 14:22:23.000000000 -0500
>+++ deskutils/ical-2.2_6/files/patch-cal_tcl.C	2018-03-23 12:04:56.618816000 -0400
>@@ -1,6 +1,6 @@
>---- cal_tcl.C.orig	Sun Nov 28 17:29:13 1999
>-+++ cal_tcl.C	Sun Nov 28 17:30:24 1999
>-@@ -214,27 +214,27 @@ static int cal_loopf	(ClientData, Tcl_In
>+--- cal_tcl.C.orig	1995-07-06 11:48:16.000000000 -0400
>++++ cal_tcl.C	2018-03-23 11:51:44.074251000 -0400
>+@@ -214,27 +214,27 @@
>  static int cal_loopb	(ClientData, Tcl_Interp*, int, char*[]);
>  
>  static Dispatch_Entry calendar_dispatch[] = {
>@@ -49,7 +49,7 @@
>      { 0,		0, 0, 0			}
>  };
>  
>-@@ -281,7 +281,7 @@ static int parse_items(Tcl_Interp* tcl, 
>+@@ -281,7 +281,7 @@
>  
>      if ((argc >= 2) && (strcmp(argv[0], "-items") == 0)) {
>  	int count;
>@@ -85,3 +85,12 @@
>  }
>  
>  static int cal_save(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){
>+@@ -609,7 +609,7 @@
>+ 
>+ 	if (dvar != 0) {
>+ 	    char buffer[20];
>+-	    sprintf(buffer, "%d", list[i].date.EpochDays());
>++	    sprintf(buffer, "%ld", list[i].date.EpochDays());
>+ 	    if (Tcl_SetVar(tcl, dvar, buffer, 0) == NULL) {
>+ 		TCL_Error(tcl, "could not set loop variable");
>+ 	    }
>diff -ruN deskutils/ical-2.2_5/files/patch-calendar_calendar.C deskutils/ical-2.2_6/files/patch-calendar_calendar.C
>--- deskutils/ical-2.2_5/files/patch-calendar_calendar.C	1969-12-31 19:00:00.000000000 -0500
>+++ deskutils/ical-2.2_6/files/patch-calendar_calendar.C	2018-03-23 12:07:27.444327000 -0400
>@@ -0,0 +1,18 @@
>+--- calendar/calendar.C.orig	2018-03-23 11:57:54.873630000 -0400
>++++ calendar/calendar.C	2018-03-23 11:58:50.059837000 -0400
>+@@ -224,13 +224,13 @@
>+ 	    char* name = new char[len + 1];
>+ 	    if (! lex->GetText(name, len) ||
>+ 		! lex->Skip(closer)) {
>+-		delete name;
>++		delete [] name;
>+ 		lex->SetError("error reading included file name");
>+ 		return 0;
>+ 	    }
>+ 	    name[len] = '\0';
>+ 	    Include(name);
>+-	    delete name;
>++	    delete [] name;
>+ 	}
>+ 	else if (strcmp(keyword, "Hide") == 0) {
>+ 	    char const* x;
>diff -ruN deskutils/ical-2.2_5/files/patch-dateeditor.C deskutils/ical-2.2_6/files/patch-dateeditor.C
>--- deskutils/ical-2.2_5/files/patch-dateeditor.C	2018-02-15 14:22:23.000000000 -0500
>+++ deskutils/ical-2.2_6/files/patch-dateeditor.C	2018-03-23 12:06:06.629768000 -0400
>@@ -1,6 +1,6 @@
>---- dateeditor.C.orig	1996-02-10 04:17:35.000000000 +0100
>-+++ dateeditor.C	2003-04-28 18:14:32.000000000 +0200
>-@@ -113,7 +113,7 @@ int Cmd_HiliteLoop(ClientData, Tcl_Inter
>+--- dateeditor.C.orig	1996-02-09 22:17:35.000000000 -0500
>++++ dateeditor.C	2018-03-23 11:52:59.753294000 -0400
>+@@ -113,7 +113,7 @@
>      }
>  
>      int count;
>@@ -9,9 +9,12 @@
>      if (Tcl_SplitList(tcl, argv[2], &count, &strlist) != TCL_OK) {
>  	return TCL_ERROR;
>      }
>-@@ -148,12 +148,12 @@ int Cmd_HiliteLoop(ClientData, Tcl_Inter
>+@@ -146,14 +146,14 @@
>+ 	if (!contains(hlist, hilite)) hilite = "always";
>+ 
>  	char buffer[20];
>- 	sprintf(buffer, "%d", list[i].date.EpochDays());
>+-	sprintf(buffer, "%d", list[i].date.EpochDays());
>++	sprintf(buffer, "%ld", list[i].date.EpochDays());
>  	if (Tcl_SetVar(tcl, dvar, buffer, 0) == NULL) {
> -	    free((char*) strlist);
> +	    Tcl_Free((char*) strlist);
>@@ -24,7 +27,7 @@
>  	    TCL_Error(tcl, "could not set loop variable");
>  	}
>  
>-@@ -165,11 +165,11 @@ int Cmd_HiliteLoop(ClientData, Tcl_Inter
>+@@ -165,11 +165,11 @@
>  	if (result == TCL_BREAK) break;
>  
>  	// Error of some sort
>diff -ruN deskutils/ical-2.2_5/files/patch-ical.h deskutils/ical-2.2_6/files/patch-ical.h
>--- deskutils/ical-2.2_5/files/patch-ical.h	2018-02-15 14:22:23.000000000 -0500
>+++ deskutils/ical-2.2_6/files/patch-ical.h	2018-03-23 12:05:45.882308000 -0400
>@@ -1,5 +1,5 @@
>---- ical.h.orig	1996-02-10 04:17:36.000000000 +0100
>-+++ ical.h	2003-04-28 18:14:32.000000000 +0200
>+--- ical.h.orig	1996-02-09 22:17:36.000000000 -0500
>++++ ical.h	2018-03-23 12:00:25.020718000 -0400
> @@ -4,6 +4,11 @@
>  
>  #include <tcl.h>
>@@ -11,4 +11,20 @@
> +
>  // Proc for triggering tcl code based on changes
>  // to calendars/items.
>+ 
>+@@ -25,13 +30,13 @@
>+ 
>+ #define TCL_Return(tcl,str)			\
>+     do {					\
>+-	Tcl_SetResult(tcl, (str), TCL_STATIC);	\
>++	Tcl_SetResult(tcl, ((char *)(str)), TCL_STATIC);	\
>+ 	return TCL_OK;				\
>+     } while (0)
>+ 
>+ #define TCL_Error(tcl,str)			\
>+     do {					\
>+-	Tcl_SetResult(tcl, (str), TCL_STATIC);	\
>++	Tcl_SetResult(tcl, ((char *)(str)), TCL_STATIC);	\
>+ 	return TCL_ERROR;			\
>+     } while (0)
>  
>diff -ruN deskutils/ical-2.2_5/files/patch-item_tcl.C deskutils/ical-2.2_6/files/patch-item_tcl.C
>--- deskutils/ical-2.2_5/files/patch-item_tcl.C	2018-02-15 14:22:23.000000000 -0500
>+++ deskutils/ical-2.2_6/files/patch-item_tcl.C	2018-03-23 12:22:13.244564000 -0400
>@@ -1,5 +1,5 @@
>---- item_tcl.C.orig	Sun Nov 28 17:31:26 1999
>-+++ item_tcl.C	Sun Nov 28 17:32:25 1999
>+--- item_tcl.C.orig	2018-03-23 12:22:06.885443000 -0400
>++++ item_tcl.C	2018-03-23 11:55:23.839264000 -0400
> @@ -106,52 +106,52 @@
>  static int item_mlweekday	(ClientData, Tcl_Interp*, int, char*[]);
>  
>@@ -14,7 +14,12 @@
> -    { "alarms",			0, 1, item_alarms	},
> -    { "option",			1, 2, item_option	},
> -    { "delete_option",		1, 1, item_doption	},
>--
>++    { "length",			0, 1, (Tcl_CmdProc *)item_length	},
>++    { "starttime",		0, 1, (Tcl_CmdProc *)item_startt	},
>++    { "alarms",			0, 1, (Tcl_CmdProc *)item_alarms	},
>++    { "option",			1, 2, (Tcl_CmdProc *)item_option	},
>++    { "delete_option",		1, 1, (Tcl_CmdProc *)item_doption	},
>+ 
> -    { "is",			1, 1, item_is		},
> -    { "calendar",		0, 0, item_cal		},
> -    { "text",			0, 1, item_text		},
>@@ -27,37 +32,6 @@
> -    { "todo",			0, 1, item_todo		},
> -    { "is_done",		0, 0, item_is_done	},
> -    { "done",			1, 1, item_done		},
>--
>--    { "contains",		1, 1, item_cont		},
>--    { "empty",			0, 0, item_empty	},
>--    { "repeats",		0, 0, item_repeat	},
>--    { "first",			0, 0, item_first	},
>--    { "next",			1, 1, item_next		},
>--    { "range",			2, 2, item_range	},
>--    { "type",			0, 0, item_type		},
>--    { "describe_repeat",	0, 0, item_desc		},
>--
>--    { "date",			1, 1, item_date		},
>--    { "dayrepeat",		2, 2, item_dayr		},
>--
>--    { "monthrepeat",		2, 2, item_monthr	},
>--    { "month_day",		1, 3, item_mday		},
>--    { "month_last_day",		1, 3, item_mlday	},
>--    { "month_work_day",		1, 3, item_mworkday	},
>--    { "month_last_work_day",	1, 3, item_mlworkday	},
>--    { "month_week_day",		2, 4, item_mweekday	},
>--    { "month_last_week_day",	2, 4, item_mlweekday	},
>--
>--    { "weekdays",		0, -1, item_wdays	},
>--    { "start",			1, 1, item_start	},
>--    { "finish",			1, 1, item_finish	},
>--    { "deleteon",		1, 1, item_ondel	},
>-+    { "length",			0, 1, (Tcl_CmdProc *)item_length	},
>-+    { "starttime",		0, 1, (Tcl_CmdProc *)item_startt	},
>-+    { "alarms",			0, 1, (Tcl_CmdProc *)item_alarms	},
>-+    { "option",			1, 2, (Tcl_CmdProc *)item_option	},
>-+    { "delete_option",		1, 1, (Tcl_CmdProc *)item_doption	},
>-+
> +    { "is",			1, 1, (Tcl_CmdProc *)item_is		},
> +    { "calendar",		0, 0, (Tcl_CmdProc *)item_cal		},
> +    { "text",			0, 1, (Tcl_CmdProc *)item_text		},
>@@ -70,7 +44,15 @@
> +    { "todo",			0, 1, (Tcl_CmdProc *)item_todo		},
> +    { "is_done",		0, 0, (Tcl_CmdProc *)item_is_done	},
> +    { "done",			1, 1, (Tcl_CmdProc *)item_done		},
>-+
>+ 
>+-    { "contains",		1, 1, item_cont		},
>+-    { "empty",			0, 0, item_empty	},
>+-    { "repeats",		0, 0, item_repeat	},
>+-    { "first",			0, 0, item_first	},
>+-    { "next",			1, 1, item_next		},
>+-    { "range",			2, 2, item_range	},
>+-    { "type",			0, 0, item_type		},
>+-    { "describe_repeat",	0, 0, item_desc		},
> +    { "contains",		1, 1, (Tcl_CmdProc *)item_cont		},
> +    { "empty",			0, 0, (Tcl_CmdProc *)item_empty		},
> +    { "repeats",		0, 0, (Tcl_CmdProc *)item_repeat	},
>@@ -79,10 +61,19 @@
> +    { "range",			2, 2, (Tcl_CmdProc *)item_range		},
> +    { "type",			0, 0, (Tcl_CmdProc *)item_type		},
> +    { "describe_repeat",	0, 0, (Tcl_CmdProc *)item_desc		},
>-+
>+ 
>+-    { "date",			1, 1, item_date		},
>+-    { "dayrepeat",		2, 2, item_dayr		},
> +    { "date",			1, 1, (Tcl_CmdProc *)item_date		},
> +    { "dayrepeat",		2, 2, (Tcl_CmdProc *)item_dayr		},
>-+
>+ 
>+-    { "monthrepeat",		2, 2, item_monthr	},
>+-    { "month_day",		1, 3, item_mday		},
>+-    { "month_last_day",		1, 3, item_mlday	},
>+-    { "month_work_day",		1, 3, item_mworkday	},
>+-    { "month_last_work_day",	1, 3, item_mlworkday	},
>+-    { "month_week_day",		2, 4, item_mweekday	},
>+-    { "month_last_week_day",	2, 4, item_mlweekday	},
> +    { "monthrepeat",		2, 2, (Tcl_CmdProc *)item_monthr	},
> +    { "month_day",		1, 3, (Tcl_CmdProc *)item_mday		},
> +    { "month_last_day",		1, 3, (Tcl_CmdProc *)item_mlday		},
>@@ -90,7 +81,11 @@
> +    { "month_last_work_day",	1, 3, (Tcl_CmdProc *)item_mlworkday	},
> +    { "month_week_day",		2, 4, (Tcl_CmdProc *)item_mweekday	},
> +    { "month_last_week_day",	2, 4, (Tcl_CmdProc *)item_mlweekday	},
>-+
>+ 
>+-    { "weekdays",		0, -1, item_wdays	},
>+-    { "start",			1, 1, item_start	},
>+-    { "finish",			1, 1, item_finish	},
>+-    { "deleteon",		1, 1, item_ondel	},
> +    { "weekdays",		0, -1, (Tcl_CmdProc *)item_wdays	},
> +    { "start",			1, 1, (Tcl_CmdProc *)item_start		},
> +    { "finish",			1, 1, (Tcl_CmdProc *)item_finish	},
>@@ -98,7 +93,6 @@
>  
>      { 0,			0, 0, 0			}
>  };
>-+++ item_tcl.C	Sun Nov 28 17:32:25 1999
> @@ -329,7 +329,7 @@
>  
>  static int item_owned(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
>@@ -108,7 +102,7 @@
>  }
>  
>  static int item_own(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
>-@@ -431,7 +431,7 @@ static int item_alarms(ClientData c, Tcl
>+@@ -431,7 +431,7 @@
>      }
>  
>      int count;
>@@ -132,6 +126,72 @@
>  }
>  
>  static int item_first(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
>+@@ -508,7 +508,7 @@
>+     }
>+ 
>+     char buffer[100];
>+-    sprintf(buffer, "%d", d.EpochDays());
>++    sprintf(buffer, "%ld", d.EpochDays());
>+     Tcl_SetResult(tcl, buffer, TCL_VOLATILE);
>+     return TCL_OK;
>+ }
>+@@ -518,43 +518,43 @@
>+     char* result;
>+     switch (item->value()->repeat_type()) {
>+       case DateSet::None:
>+-	result = "";
>++	result = (char *)"";
>+ 	break;
>+       case DateSet::Daily:
>+-	result = "Daily";
>++	result = (char *)"Daily";
>+ 	break;
>+       case DateSet::Weekly:
>+-	result = "Weekly";
>++	result = (char *)"Weekly";
>+ 	break;
>+       case DateSet::BiWeekly:
>+-	result = "Every Two Weeks";
>++	result = (char *)"Every Two Weeks";
>+ 	break;
>+       case DateSet::ThreeWeekly:
>+-	result = "Every Three Weeks";
>++	result = (char *)"Every Three Weeks";
>+ 	break;
>+       case DateSet::FourWeekly:
>+-	result = "Every Four Weeks";
>++	result = (char *)"Every Four Weeks";
>+ 	break;
>+       case DateSet::Monthly:
>+-	result = "Monthly";
>++	result = (char *)"Monthly";
>+ 	break;
>+       case DateSet::TwoMonthly:
>+-	result = "Every Two Months";
>++	result = (char *)"Every Two Months";
>+ 	break;
>+       case DateSet::ThreeMonthly:
>+-	result = "Every Three Months";
>++	result = (char *)"Every Three Months";
>+ 	break;
>+       case DateSet::FourMonthly:
>+-	result = "Every Four Months";
>++	result = (char *)"Every Four Months";
>+ 	break;
>+       case DateSet::SixMonthly:
>+-	result = "Every Six Months";
>++	result = (char *)"Every Six Months";
>+ 	break;
>+       case DateSet::Annual:
>+-	result = "Annual";
>++	result = (char *)"Annual";
>+ 	break;
>+       default:
>+-	result = "Complex";
>++	result = (char *)"Complex";
>+ 	break;
>+     }
>+     TCL_Return(tcl, result);
> @@ -576,7 +576,7 @@
>  	TCL_Error(tcl, "invalid date");
>      }
>@@ -141,3 +201,34 @@
>  }
>  
>  static int item_next(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) {
>+@@ -592,7 +592,7 @@
>+     }
>+ 
>+     char buffer[100];
>+-    sprintf(buffer, "%d", next.EpochDays());
>++    sprintf(buffer, "%ld", next.EpochDays());
>+     Tcl_SetResult(tcl, buffer, TCL_VOLATILE);
>+     return TCL_OK;
>+ }
>+@@ -603,10 +603,10 @@
>+     Date s, f;
>+     if (item->value()->range(s, f)) {
>+ 	char buffer[100];
>+-	sprintf(buffer, "%d", s.EpochDays());
>++	sprintf(buffer, "%ld", s.EpochDays());
>+ 	if (Tcl_SetVar(tcl, argv[0], buffer, 0) == NULL)
>+ 	    TCL_Error(tcl, "could not set range start variable");
>+-	sprintf(buffer, "%d", f.EpochDays());
>++	sprintf(buffer, "%ld", f.EpochDays());
>+ 	if (Tcl_SetVar(tcl, argv[1], buffer, 0) == NULL)
>+ 	    TCL_Error(tcl, "could not set range finish variable");
>+ 	TCL_Return(tcl, "1");
>+@@ -886,7 +886,7 @@
>+     if (file == 0) return 1;
>+ 
>+     if (file->GetCalendar()->ReadOnly()) {
>+-	Tcl_SetResult(tcl, "item is in readonly calendar", TCL_STATIC);
>++	Tcl_SetResult(tcl, (char *)"item is in readonly calendar", TCL_STATIC);
>+ 	return 0;
>+     }
>+ 
>diff -ruN deskutils/ical-2.2_5/files/patch-time_tcl.C deskutils/ical-2.2_6/files/patch-time_tcl.C
>--- deskutils/ical-2.2_5/files/patch-time_tcl.C	1969-12-31 19:00:00.000000000 -0500
>+++ deskutils/ical-2.2_6/files/patch-time_tcl.C	2018-03-23 12:05:28.182430000 -0400
>@@ -0,0 +1,11 @@
>+--- time_tcl.C.orig	1994-05-19 23:22:05.000000000 -0400
>++++ time_tcl.C	2018-03-23 11:56:43.518373000 -0400
>+@@ -135,7 +135,7 @@
>+ 		TCL_Return(tcl, "0");
>+ 
>+ 	    // Set variables
>+-	    sprintf(buffer, "%d", result.EpochDays());
>++	    sprintf(buffer, "%ld", result.EpochDays());
>+ 	    if (Tcl_SetVar(tcl, argv[3], buffer, 0) == NULL)
>+ 		TCL_Error(tcl, "could not set <date> result");
>+

Flags:

fbsd: maintainer-approval+

Actions: View | Diff

Attachments on bug 226799: 191659 | 191722 | 191755 | 191756