felixfoertsch/remind
1
0
Fork 0
mirror of https://salsa.debian.org/dskoll/remind.git synced 2026-04-16 06:18:47 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow NULL pointers to be supplied to FromJulian if we are not interested in specific values

Browse Source
This commit is contained in:
Dianne Skoll
2022-09-17 23:04:34 -04:00
parent 8051d01945
commit fc93ae890a
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/calendar.c
View File

@@ -301,8 +301,8 @@ static void WriteCalDays (void);
static int
DayOf(int jul)
{
int y, m, d;
FromJulian(jul, &y, &m, &d);
int d;
FromJulian(jul, NULL, NULL, &d);
return d;
}

15
src/main.c
View File

@@ -329,7 +329,8 @@ int Julian(int year, int month, int day)
/* */
/* FromJulian */
/* */
/* Convert a Julian date to year, month, day. */
/* Convert a Julian date to year, month, day. You may supply */
/* NULL for y, m or d if you're not interested in that value */
/* */
/***************************************************************/
void FromJulian(int jul, int *y, int *m, int *d)
@@ -358,9 +359,15 @@ void FromJulian(int jul, int *y, int *m, int *d)
try_mon++;
t = DaysInMonth(try_mon, try_yr);
}
*y = try_yr;
*m = try_mon;
*d = jul + 1;
if (y) {
*y = try_yr;
}
if (m) {
*m = try_mon;
}
if (d) {
*d = jul + 1;
}
return;
}