overload with ::to(ref), missing license, minor details

d-a-v · d-a-v · commit fd32e65ae545 · 2020-01-03T11:52:31.000+01:00
diff --git a/cores/esp8266/Stream.h b/cores/esp8266/Stream.h
@@ -196,10 +196,19 @@ class Stream: public Print {
 
         using oneShotMs = esp8266::polledTimeout::oneShotFastMs;
 
-        virtual size_t to (Print* to,
-                           const ssize_t maxLen = -1,
-                           int readUntilChar = -1,
-                           oneShotMs::timeType timeoutMs = oneShotMs::neverExpires /* =>getTimeout() */) final;
+        size_t to (Print* to,
+                   const ssize_t maxLen = -1,
+                   int readUntilChar = -1,
+                   oneShotMs::timeType timeoutMs = oneShotMs::neverExpires /* =>getTimeout() */);
+
+        size_t to (Print& to,
+                   const ssize_t maxLen = -1,
+                   int readUntilChar = -1,
+                   oneShotMs::timeType timeoutMs = oneShotMs::neverExpires /* =>getTimeout() */)
+        {
+            return this->to(&to, maxLen, readUntilChar, timeoutMs);
+        }
+
         typedef enum
         {
             STREAMTO_SUCCESS = 0,
diff --git a/cores/esp8266/StreamDev.cpp b/cores/esp8266/StreamDev.cpp
@@ -1,3 +1,24 @@
+/*
+ StreamDev.cpp - 1-copy transfer function
+ Copyright (c) 2019 David Gauchard.  All right reserved.
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+ parsing functions based on TextFinder library by Michael Margolis
+*/
+
 
 #include <Arduino.h>
 #include <assert.h>
diff --git a/cores/esp8266/StreamDev.h b/cores/esp8266/StreamDev.h
@@ -1,3 +1,23 @@
+/*
+ StreamDev.h - Stream helpers
+ Copyright (c) 2019 David Gauchard.  All right reserved.
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+ parsing functions based on TextFinder library by Michael Margolis
+*/
 
 #ifndef __STREAMDEV_H
 #define __STREAMDEV_H
diff --git a/cores/esp8266/StreamString.h b/cores/esp8266/StreamString.h
@@ -25,7 +25,7 @@
 
 #include "WString.h"
 
-// StreamString has been integrated insite String
+// StreamString has been integrated into String
 
 using StreamString = String;
 
diff --git a/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.cpp b/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.cpp
@@ -33,17 +33,17 @@
 #include <StreamDev.h>
 #include <base64.h>
 
-int TO2HTTPC (int streamToError)
+static int TO2HTTPC (Stream::toReport_e streamToError)
 {
     switch (streamToError)
     {
     case Stream::STREAMTO_TIMED_OUT: return HTTPC_ERROR_READ_TIMEOUT;
     case Stream::STREAMTO_READ_ERROR: return HTTPC_ERROR_NO_STREAM;
     case Stream::STREAMTO_WRITE_ERROR: return HTTPC_ERROR_STREAM_WRITE;
     case Stream::STREAMTO_SHORT: return HTTPC_ERROR_STREAM_WRITE;
-    default:
     case Stream::STREAMTO_SUCCESS: return 0;
     }
+    return 0; // never reached, keep gcc quiet
 }
 
 #if HTTPCLIENT_1_1_COMPATIBLE
@@ -1071,8 +1071,8 @@ bool HTTPClient::connect(void)
         } else {
             DEBUG_HTTPCLIENT("[HTTP-Client] connect: already connected, try reuse!\n");
         }
-        StreamNull devnull;
-        _client->to(&devnull, -1, -1, 0); // clear _client's output (all of it, no timeout)
+        StreamNull devNull; // should we have a global one?
+        _client->to(devNull); // clear _client's output (all of it, no timeout)
         return true;
     }
 
diff --git a/libraries/ESP8266WiFi/examples/WiFiEcho/WiFiEcho.ino b/libraries/ESP8266WiFi/examples/WiFiEcho/WiFiEcho.ino
@@ -1,5 +1,5 @@
 /*
-  WiFiEcho - Echo tester
+  WiFiEcho - Echo server
 
   released to public domain
 */
@@ -91,8 +91,8 @@ void loop() {
 
   else if (t == 3) {
     // stream to print, possibly with only one copy
-    //client.to(&client); // <=> client.to(&client, -1, -1, client->getTimeout())
-    client.to(&client, -1, -1, breathMs);
+    //client.to(client); // <=> client.to(&client, -1, -1, client->getTimeout())
+    client.to(client, -1, -1, breathMs);
 
     switch (client.getLastTo()) {
       case Stream::STREAMTO_SUCCESS: break;
diff --git a/tests/host/Makefile b/tests/host/Makefile
@@ -6,6 +6,7 @@ LIBRARIES_PATH := ../../libraries
 FORCE32 ?= 1
 OPTZ ?= -Os
 V ?= 0
+R ?= noexec
 
 MAKEFILE = $(word 1, $(MAKEFILE_LIST))
 
@@ -330,6 +331,7 @@ ifeq ($(INO),)
 %: %.ino
 	@# recursive 'make' with paths
 	$(MAKE) -f $(MAKEFILE) MKFLAGS=-Wextra INODIR=$(dir $@) INO=$(notdir $@) $(BINDIR)/$(notdir $@)/$(notdir $@)
+	test "$(R)" = noexec || $(BINDIR)/$(notdir $@)/$(notdir $@) $(R)
 	@# see below the new build rule with fixed output path outside from core location
 
 #####################
diff --git a/tests/host/README.txt b/tests/host/README.txt
@@ -45,7 +45,7 @@ Optional 'V=1' enables makefile verbosity
 Optional 'D=1' enables core debug (same as IDE's tools menu)
 Optional 'OPTZ=-O2' will update gcc -O option (default is -Os, D=1 implies -O0)
 Optional 'FORCE32=0' will use native/default gcc (default is FORCE32=1 unless gcc-multilib is not detected)
-
+Optional 'R="<options>"' (ex: R="-b -v") runs the executable with given options after build
 
 Non exhaustive list of working examples:
 	make D=1 ../../libraries/ESP8266WiFi/examples/udp/udp

Original file line number	Diff line number	Diff line change
`@@ -33,17 +33,17 @@`
`33`	`33`	`#include <StreamDev.h>`
`34`	`34`	`#include <base64.h>`
`35`	`35`
`36`		`-int TO2HTTPC (int streamToError)`
	`36`	`+static int TO2HTTPC (Stream::toReport_e streamToError)`
`37`	`37`	`{`
`38`	`38`	`switch (streamToError)`
`39`	`39`	`{`
`40`	`40`	`case Stream::STREAMTO_TIMED_OUT: return HTTPC_ERROR_READ_TIMEOUT;`
`41`	`41`	`case Stream::STREAMTO_READ_ERROR: return HTTPC_ERROR_NO_STREAM;`
`42`	`42`	`case Stream::STREAMTO_WRITE_ERROR: return HTTPC_ERROR_STREAM_WRITE;`
`43`	`43`	`case Stream::STREAMTO_SHORT: return HTTPC_ERROR_STREAM_WRITE;`
`44`		`- default:`
`45`	`44`	`case Stream::STREAMTO_SUCCESS: return 0;`
`46`	`45`	`}`
	`46`	`+ return 0; // never reached, keep gcc quiet`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`#if HTTPCLIENT_1_1_COMPATIBLE`
`@@ -1071,8 +1071,8 @@ bool HTTPClient::connect(void)`
`1071`	`1071`	`} else {`
`1072`	`1072`	`DEBUG_HTTPCLIENT("[HTTP-Client] connect: already connected, try reuse!\n");`
`1073`	`1073`	`}`
`1074`		`- StreamNull devnull;`
`1075`		`- _client->to(&devnull, -1, -1, 0); // clear _client's output (all of it, no timeout)`
	`1074`	`+ StreamNull devNull; // should we have a global one?`
	`1075`	`+ _client->to(devNull); // clear _client's output (all of it, no timeout)`
`1076`	`1076`	`return true;`
`1077`	`1077`	`}`
`1078`	`1078`