Fixed some error check.

`execSizeReceipe` now returns a tuple instead of modifying parameters.
This change also showed that eepromSize is never used.

Signed-off-by: Cristian Maglie <[email protected]>

Author: cmaglie

src/arduino.cc/builder/phases/sizer.go

@@ -73,18 +73,16 @@ func checkSize(buildProperties properties.Map, verbose bool, warningsLevel strin
 	if err != nil {
 		return err
 	}
-	maxDataSize := -1
 
+	maxDataSize := -1
 	if maxDataSizeString != "" {
 		maxDataSize, err = strconv.Atoi(maxDataSizeString)
 		if err != nil {
 			return err
 		}
 	}
 
-	textSize, dataSize, eepromSize := -1, -1, -1
-
-	err = execSizeReceipe(properties, logger, &textSize, &dataSize, &eepromSize)
+	textSize, dataSize, _, err := execSizeReceipe(properties, logger)
 	if err != nil {
 		logger.Println(constants.LOG_LEVEL_WARN, constants.MSG_SIZER_ERROR_NO_RULE)
 		return nil
@@ -122,12 +120,11 @@ func checkSize(buildProperties properties.Map, verbose bool, warningsLevel strin
 	return nil
 }
 
-func execSizeReceipe(properties properties.Map, logger i18n.Logger, textSize *int, dataSize *int, eepromSize *int) error {
-
+func execSizeReceipe(properties properties.Map, logger i18n.Logger) (textSize int, dataSize int, eepromSize int, resErr error) {
 	out, err := builder_utils.ExecRecipe(properties, constants.RECIPE_SIZE_PATTERN, false, false, false, logger)
-
 	if err != nil {
-		return errors.New("")
+		resErr = errors.New("Error while determining sketch size: " + err.Error())
+		return
 	}
 
 	// force multiline match prepending "(?m)" to the actual regexp
@@ -136,46 +133,56 @@ func execSizeReceipe(properties properties.Map, logger i18n.Logger, textSize *in
 	if len(properties[constants.RECIPE_SIZE_REGEXP]) > 0 {
 		textRegexp, err := regexp.Compile("(?m)" + properties[constants.RECIPE_SIZE_REGEXP])
 		if err != nil {
-			return errors.New("")
+			resErr = errors.New("Invalid size regexp: " + err.Error())
+			return
 		}
 		result := textRegexp.FindAllSubmatch(out, -1)
 		for _, b := range result {
 			for _, c := range b {
-				res, _ := strconv.Atoi(string(c))
-				*textSize += res
+				if res, err := strconv.Atoi(string(c)); err == nil {
+					textSize += res
+				}
 			}
 		}
 	} else {
-		return errors.New("")
+		resErr = errors.New("Missing size regexp")
+		return
 	}
 
 	if len(properties[constants.RECIPE_SIZE_REGEXP_DATA]) > 0 {
 		dataRegexp, err := regexp.Compile("(?m)" + properties[constants.RECIPE_SIZE_REGEXP_DATA])
 		if err != nil {
-			return errors.New("")
+			resErr = errors.New("Invalid data size regexp: " + err.Error())
+			return
 		}
 		result := dataRegexp.FindAllSubmatch(out, -1)
 		for _, b := range result {
 			for _, c := range b {
-				res, _ := strconv.Atoi(string(c))
-				*dataSize += res
+				if res, err := strconv.Atoi(string(c)); err == nil {
+					dataSize += res
+				}
 			}
 		}
+	} else {
+		dataSize = -1
 	}
 
 	if len(properties[constants.RECIPE_SIZE_REGEXP_EEPROM]) > 0 {
 		eepromRegexp, err := regexp.Compile("(?m)" + properties[constants.RECIPE_SIZE_REGEXP_EEPROM])
 		if err != nil {
-			return errors.New("")
+			resErr = errors.New("Invalid eeprom size regexp: " + err.Error())
+			return
 		}
 		result := eepromRegexp.FindAllSubmatch(out, -1)
 		for _, b := range result {
 			for _, c := range b {
-				res, _ := strconv.Atoi(string(c))
-				*eepromSize += res
+				if res, err := strconv.Atoi(string(c)); err == nil {
+					eepromSize += res
+				}
 			}
 		}
+	} else {
+		eepromSize = -1
 	}
-
-	return nil
+	return
 }