wday fix

yparitcher · Apr 15, 2019 · feb14c9 · feb14c9
1 parent 3544f1a
commit feb14c9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/include/hebrewcalendar.h b/include/hebrewcalendar.h
@@ -40,7 +40,7 @@ typedef struct {
 	int min; // 0 - 59
 	int sec; // 0 - 59
 	int msec;
-	int wday; // weekdays 1 - 7
+	int wday; // weekdays 1 - 6, 0
 	int dayofyear; // starts from tishrei
 	long int offset; // timezone offset in seconds
 	_Bool leap; // if leap year

diff --git a/src/hdateformat.c b/src/hdateformat.c
@@ -175,7 +175,7 @@ char* numtohchar(int innum)
 
 const char* numtowday(hdate date, _Bool shabbos)
 {
-	if (shabbos && (date.wday == 7)) {return hwday[0];}
+	if (shabbos && (!date.wday)) {return hwday[0];}
 	return hwday[date.wday];
 }
 

diff --git a/src/shuir.c b/src/shuir.c
@@ -25,14 +25,14 @@ int chumash(hdate date, char* buffer)
 	parshah current = NOPARSHAH;
 	hdate shabbos = date;
 	int st = shabbos.EY ? 22 : 23;
-	for (hdateaddday(&shabbos, 7-shabbos.wday); (current = getparshah(shabbos)) == NOPARSHAH; hdateaddday(&shabbos, 7)){}
+	for (; (current = getparshah(shabbos)) == NOPARSHAH; hdateaddday(&shabbos, 7-shabbos.wday)){}
 	if (current == BERESHIT)
 	{
 		if (date.day < st) {current = VZOT_HABERACHAH;}
 		else if  (date.day == st){
 			if (date.wday == 1){
 				return sprintf(buffer, "פרשת %s %s עם פירש״י", parshahformat(BERESHIT), numtowday(date, 0));
-			}else if (date.wday == 7){
+			}else if (!date.wday){
 				return sprintf(buffer, "פרשת %s %s עם פירש״י", parshahformat(VZOT_HABERACHAH), numtowday(date, 0));
 			}else{
 				return sprintf(buffer, "פרשת %s %s - שביעי, %s ראשון - %s עם פירש״י", parshahformat(VZOT_HABERACHAH), numtowday(date, 0), parshahformat(BERESHIT), numtowday(date, 0));

diff --git a/test/test.c b/test/test.c
@@ -176,7 +176,7 @@ int main(int argc, char *argv[])
 	{
 		printf("%-20.20s%s\n", "candle lighting: ", formattime(gettzais8p5(hebrewDate, here)));
 		printf("%-20.20s%s\n", "tzais: ", formattime(gettzais8p5(hebrewDate, here)));
-	} else if (hebrewDate.wday == 7 || isassurbemelachah(hebrewDate)){
+	} else if (isassurbemelachah(hebrewDate)){
 		printf("%-20.20s%s\n", "shabbos ends: ", formattime(gettzais8p5(hebrewDate, here)));
 	} else {
 		printf("%-20.20s%s\n", "tzais: ", formattime(gettzaisbaalhatanya(hebrewDate, here)));