Skip to content

Commit db939d7

Browse files
committed
fix werror=address
1 parent 4d87df2 commit db939d7

File tree

1 file changed

+3
-49
lines changed

1 file changed

+3
-49
lines changed

src/AdafruitIO_Data.cpp

Lines changed: 3 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -419,12 +419,7 @@ void AdafruitIO_Data::setValue(double value, double lat, double lon, double ele,
419419
@return Feed's name if feed exists.
420420
*/
421421
/**************************************************************************/
422-
char *AdafruitIO_Data::feedName() {
423-
if (!_feed)
424-
return (char *)"";
425-
426-
return _feed;
427-
}
422+
char *AdafruitIO_Data::feedName() { return _feed; }
428423

429424
/**************************************************************************/
430425
/*!
@@ -448,12 +443,7 @@ char *AdafruitIO_Data::toChar() { return _value; }
448443
@return String of value.
449444
*/
450445
/**************************************************************************/
451-
String AdafruitIO_Data::toString() {
452-
if (!_value)
453-
return String();
454-
455-
return String(_value);
456-
}
446+
String AdafruitIO_Data::toString() { return String(_value); }
457447

458448
/**************************************************************************/
459449
/*!
@@ -462,13 +452,9 @@ String AdafruitIO_Data::toString() {
462452
*/
463453
/**************************************************************************/
464454
bool AdafruitIO_Data::toBool() {
465-
if (!_value)
466-
return false;
467-
468455
if (strcmp(_value, "1") == 0 || _value[0] == 't' || _value[0] == 'T')
469456
return true;
470-
else
471-
return false;
457+
return false;
472458
}
473459

474460
/**************************************************************************/
@@ -494,9 +480,6 @@ bool AdafruitIO_Data::isFalse() { return !toBool(); }
494480
*/
495481
/**************************************************************************/
496482
int AdafruitIO_Data::toInt() {
497-
if (!_value)
498-
return 0;
499-
500483
char *endptr;
501484
return (int)strtol(_value, &endptr, 10);
502485
}
@@ -542,9 +525,6 @@ unsigned int AdafruitIO_Data::toUnsignedInt() {
542525
*/
543526
/**************************************************************************/
544527
float AdafruitIO_Data::toFloat() {
545-
if (!_value)
546-
return 0;
547-
548528
char *endptr;
549529
return (float)strtod(_value, &endptr);
550530
}
@@ -556,9 +536,6 @@ float AdafruitIO_Data::toFloat() {
556536
*/
557537
/**************************************************************************/
558538
double AdafruitIO_Data::toDouble() {
559-
if (!_value)
560-
return 0;
561-
562539
char *endptr;
563540
return strtod(_value, &endptr);
564541
}
@@ -570,9 +547,6 @@ double AdafruitIO_Data::toDouble() {
570547
*/
571548
/**************************************************************************/
572549
long AdafruitIO_Data::toLong() {
573-
if (!_value)
574-
return 0;
575-
576550
char *endptr;
577551
return strtol(_value, &endptr, 10);
578552
}
@@ -584,9 +558,6 @@ long AdafruitIO_Data::toLong() {
584558
*/
585559
/**************************************************************************/
586560
unsigned long AdafruitIO_Data::toUnsignedLong() {
587-
if (!_value)
588-
return 0;
589-
590561
char *endptr;
591562
#ifdef ESP8266
592563
// For some reason strtoul is not defined on the ESP8266 platform right now.
@@ -605,9 +576,6 @@ unsigned long AdafruitIO_Data::toUnsignedLong() {
605576
/**************************************************************************/
606577
int AdafruitIO_Data::toRed() {
607578
// Convert 0xRRGGBB to red.
608-
if (!_value) {
609-
return 0;
610-
}
611579
char r[5];
612580
strcpy(r, "0x");
613581
strncpy(&r[2], toChar() + 1, 2);
@@ -623,9 +591,6 @@ int AdafruitIO_Data::toRed() {
623591
/**************************************************************************/
624592
int AdafruitIO_Data::toGreen() {
625593
// Convert 0xRRGGBB to green.
626-
if (!_value) {
627-
return 0;
628-
}
629594
char g[5];
630595
strcpy(g, "0x");
631596
strncpy(&g[2], toChar() + 3, 2);
@@ -641,9 +606,6 @@ int AdafruitIO_Data::toGreen() {
641606
/**************************************************************************/
642607
int AdafruitIO_Data::toBlue() {
643608
// Convert 0xRRGGBB to blue.
644-
if (!_value) {
645-
return 0;
646-
}
647609
char b[5];
648610
strcpy(b, "0x");
649611
strncpy(&b[2], toChar() + 5, 2);
@@ -659,9 +621,6 @@ int AdafruitIO_Data::toBlue() {
659621
*/
660622
/**************************************************************************/
661623
long AdafruitIO_Data::toNeoPixel() {
662-
if (!_value) {
663-
return 0;
664-
}
665624
char rgb[9];
666625
strcpy(rgb, "0x");
667626
strncpy(&rgb[2], toChar() + 1, 6);
@@ -676,11 +635,7 @@ long AdafruitIO_Data::toNeoPixel() {
676635
*/
677636
/**************************************************************************/
678637
char *AdafruitIO_Data::toCSV() {
679-
if (!_value)
680-
return _csv;
681-
682638
memset(_csv, 0, AIO_CSV_LENGTH);
683-
684639
strcpy(_csv, "\"");
685640
strcat(_csv, _value);
686641
strcat(_csv, "\",");
@@ -689,7 +644,6 @@ char *AdafruitIO_Data::toCSV() {
689644
strcat(_csv, charFromDouble(_lon));
690645
strcat(_csv, ",");
691646
strcat(_csv, charFromDouble(_ele, 2));
692-
693647
return _csv;
694648
}
695649

0 commit comments

Comments
 (0)