Fix some problems

1set · Sep 4, 2022 · 02579b8 · 02579b8
1 parent 921be54
commit 02579b8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/cronrange.go b/cronrange.go
@@ -62,9 +62,9 @@ func (cr *CronRange) CronExpression() string {
 	return cr.cronExpression
 }
 
-func new(cronExpr, timeZone string, duration time.Duration, cp cron.Parser) (cr *CronRange, err error) {
+func new(cronExpr, timeZone string, dur time.Duration, cp cron.Parser) (cr *CronRange, err error) {
 	// Precondition check
-	if duration <= 0 {
+	if dur <= 0 {
 		err = errZeroDuration
 		return
 	}
@@ -89,7 +89,7 @@ func new(cronExpr, timeZone string, duration time.Duration, cp cron.Parser) (cr
 	cr = &CronRange{
 		cronExpression: cronExpr,
 		timeZone:       timeZone,
-		duration:       duration,
+		duration:       dur,
 		schedule:       schedule,
 	}
 	return

diff --git a/serialize.go b/serialize.go
@@ -95,9 +95,8 @@ PL:
 			if durMin, err = strconv.ParseUint(durStr, 10, 64); err != nil {
 				if version != Version2 {
 					break PL
-				} else {
-					err = nil
 				}
+				err = nil
 			}
 		case strings.HasPrefix(part, strMarkTimeZone):
 			timeZone = part[len(strMarkTimeZone):]
@@ -121,7 +120,7 @@ PL:
 }
 
 func ParseStringWithCronParser(s string, cp cron.Parser) (cr *CronRange, err error) {
-	cr, err = parseString(s, cronParser)
+	cr, err = parseString(s, cp)
 	return
 }