Fixing more warnings (Paul Stoffregen).

damellis · damellis · commit ca671fdc05bf · 2011-10-10T11:28:44.000-04:00
diff --git a/hardware/arduino/cores/arduino/HardwareSerial.cpp b/hardware/arduino/cores/arduino/HardwareSerial.cpp
@@ -91,7 +91,7 @@ inline void store_char(unsigned char c, ring_buffer *buffer)
 #if !defined(USART_RX_vect) && !defined(SIG_USART0_RECV) && \
     !defined(SIG_UART0_RECV) && !defined(USART0_RX_vect) && \
 	!defined(SIG_UART_RECV)
-  #error Don't know what the Data Received vector is called for the first UART
+  #error "Don't know what the Data Received vector is called for the first UART"
 #else
   void serialEvent() __attribute__((weak));
   void serialEvent() {}
@@ -180,7 +180,7 @@ void serialEventRun(void)
 // do nothing - on the 32u4 the first USART is USART1
 #else
 #if !defined(UART0_UDRE_vect) && !defined(UART_UDRE_vect) && !defined(USART0_UDRE_vect) && !defined(USART_UDRE_vect)
-  #error Don't know what the Data Register Empty vector is called for the first UART
+  #error "Don't know what the Data Register Empty vector is called for the first UART"
 #else
 #if defined(UART0_UDRE_vect)
 ISR(UART0_UDRE_vect)
diff --git a/hardware/arduino/cores/arduino/Print.cpp b/hardware/arduino/cores/arduino/Print.cpp
@@ -54,7 +54,7 @@ size_t Print::print(const __FlashStringHelper *ifsh)
 size_t Print::print(const String &s)
 {
   size_t n = 0;
-  for (int i = 0; i < s.length(); i++) {
+  for (uint16_t i = 0; i < s.length(); i++) {
     n += write(s[i]);
   }
   return n;
diff --git a/hardware/arduino/cores/arduino/WString.cpp b/hardware/arduino/cores/arduino/WString.cpp
@@ -498,7 +498,7 @@ int String::lastIndexOf( char theChar ) const
 	return lastIndexOf(theChar, len - 1);
 }
 
-int String::lastIndexOf(char ch, int fromIndex) const
+int String::lastIndexOf(char ch, unsigned int fromIndex) const
 {
 	if (fromIndex >= len || fromIndex < 0) return -1;
 	char tempchar = buffer[fromIndex + 1];
@@ -514,15 +514,15 @@ int String::lastIndexOf(const String &s2) const
 	return lastIndexOf(s2, len - s2.len);
 }
 
-int String::lastIndexOf(const String &s2, int fromIndex) const
+int String::lastIndexOf(const String &s2, unsigned int fromIndex) const
 {
   	if (s2.len == 0 || len == 0 || s2.len > len || fromIndex < 0) return -1;
 	if (fromIndex >= len) fromIndex = len - 1;
 	int found = -1;
 	for (char *p = buffer; p <= buffer + fromIndex; p++) {
 		p = strstr(p, s2.buffer);
 		if (!p) break;
-		if (p - buffer <= fromIndex) found = p - buffer;
+		if ((unsigned int)(p - buffer) <= fromIndex) found = p - buffer;
 	}
 	return found;
 }
diff --git a/hardware/arduino/cores/arduino/WString.h b/hardware/arduino/cores/arduino/WString.h
@@ -154,9 +154,9 @@ class String
 	int indexOf( const String &str ) const;
 	int indexOf( const String &str, unsigned int fromIndex ) const;
 	int lastIndexOf( char ch ) const;
-	int lastIndexOf( char ch, int fromIndex ) const;
+	int lastIndexOf( char ch, unsigned int fromIndex ) const;
 	int lastIndexOf( const String &str ) const;
-	int lastIndexOf( const String &str, int fromIndex ) const;
+	int lastIndexOf( const String &str, unsigned int fromIndex ) const;
 	String substring( unsigned int beginIndex ) const;
 	String substring( unsigned int beginIndex, unsigned int endIndex ) const;
 
diff --git a/hardware/arduino/cores/arduino/wiring_private.h b/hardware/arduino/cores/arduino/wiring_private.h
@@ -27,7 +27,6 @@
 
 #include <avr/io.h>
 #include <avr/interrupt.h>
-#include <avr/delay.h>
 #include <stdio.h>
 #include <stdarg.h>
 
diff --git a/libraries/SD/File.cpp b/libraries/SD/File.cpp
@@ -18,7 +18,7 @@
    uint8_t nfilecount=0;
 */
 
-File::File(SdFile f, char *n) {
+File::File(SdFile f, const char *n) {
   // oh man you are kidding me, new() doesnt exist? Ok we do it by hand!
   _file = (SdFile *)malloc(sizeof(SdFile)); 
   if (_file) {
diff --git a/libraries/SD/SD.cpp b/libraries/SD/SD.cpp
@@ -348,7 +348,7 @@ boolean SDClass::begin(uint8_t csPin) {
 
 
 // this little helper is used to traverse paths
-SdFile SDClass::getParentDir(char *filepath, int *index) {
+SdFile SDClass::getParentDir(const char *filepath, int *index) {
   // get parent directory
   SdFile d1 = root; // start with the mostparent, root!
   SdFile d2;
@@ -357,7 +357,7 @@ SdFile SDClass::getParentDir(char *filepath, int *index) {
   SdFile *parent = &d1;
   SdFile *subdir = &d2;
   
-  char *origpath = filepath;
+  const char *origpath = filepath;
 
   while (strchr(filepath, '/')) {
 
@@ -404,7 +404,7 @@ SdFile SDClass::getParentDir(char *filepath, int *index) {
 }
 
 
-File SDClass::open(char *filepath, uint8_t mode) {
+File SDClass::open(const char *filepath, uint8_t mode) {
   /*
 
      Open the supplied file path for reading or writing.
diff --git a/libraries/SD/SD.h b/libraries/SD/SD.h
@@ -29,7 +29,7 @@ class File : public Stream {
   SdFile *_file;  // underlying file pointer
 
 public:
-  File(SdFile f, char *name);     // wraps an underlying SdFile
+  File(SdFile f, const char *name);     // wraps an underlying SdFile
   File(void);      // 'empty' constructor
   ~File(void);     // destructor
   virtual size_t write(uint8_t);
@@ -62,7 +62,7 @@ class SDClass {
   SdFile root;
   
   // my quick&dirty iterator, should be replaced
-  SdFile getParentDir(char *filepath, int *indx);
+  SdFile getParentDir(const char *filepath, int *indx);
 public:
   // This needs to be called to set up the connection to the SD card
   // before other methods are used.
@@ -71,7 +71,7 @@ class SDClass {
   // Open the specified file/directory with the supplied mode (e.g. read or
   // write, etc). Returns a File object for interacting with the file.
   // Note that currently only one file can be open at a time.
-  File open(char *filename, uint8_t mode = FILE_READ);
+  File open(const char *filename, uint8_t mode = FILE_READ);
 
   // Methods to determine if the requested file path exists.
   boolean exists(char *filepath);
diff --git a/libraries/SD/utility/SdFatUtil.h b/libraries/SD/utility/SdFatUtil.h
@@ -30,10 +30,11 @@
 /** Store and print a string in flash memory followed by a CR/LF.*/
 #define PgmPrintln(x) SerialPrintln_P(PSTR(x))
 /** Defined so doxygen works for function definitions. */
-#define NOINLINE __attribute__((noinline))
+#define NOINLINE __attribute__((noinline,unused))
+#define UNUSEDOK __attribute__((unused))
 //------------------------------------------------------------------------------
 /** Return the number of bytes currently free in RAM. */
-static int FreeRam(void) {
+static UNUSEDOK int FreeRam(void) {
   extern int  __bss_end;
   extern int* __brkval;
   int free_memory;
diff --git a/libraries/Wire/utility/twi.c b/libraries/Wire/utility/twi.c
@@ -23,6 +23,7 @@
 #include <avr/io.h>
 #include <avr/interrupt.h>
 #include <compat/twi.h>
+#include "Arduino.h" // for digitalWrite
 
 #ifndef cbi
 #define cbi(sfr, bit) (_SFR_BYTE(sfr) &= ~_BV(bit))

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ size_t Print::print(const __FlashStringHelper *ifsh)`
`54`	`54`	`size_t Print::print(const String &s)`
`55`	`55`	`{`
`56`	`56`	`size_t n = 0;`
`57`		`- for (int i = 0; i < s.length(); i++) {`
	`57`	`+ for (uint16_t i = 0; i < s.length(); i++) {`
`58`	`58`	`n += write(s[i]);`
`59`	`59`	`}`
`60`	`60`	`return n;`
Original file line number	Diff line number	Diff line change
`@@ -498,7 +498,7 @@ int String::lastIndexOf( char theChar ) const`
`498`	`498`	`return lastIndexOf(theChar, len - 1);`
`499`	`499`	`}`
`500`	`500`
`501`		`-int String::lastIndexOf(char ch, int fromIndex) const`
	`501`	`+int String::lastIndexOf(char ch, unsigned int fromIndex) const`
`502`	`502`	`{`
`503`	`503`	`if (fromIndex >= len \|\| fromIndex < 0) return -1;`
`504`	`504`	`char tempchar = buffer[fromIndex + 1];`
`@@ -514,15 +514,15 @@ int String::lastIndexOf(const String &s2) const`
`514`	`514`	`return lastIndexOf(s2, len - s2.len);`
`515`	`515`	`}`
`516`	`516`
`517`		`-int String::lastIndexOf(const String &s2, int fromIndex) const`
	`517`	`+int String::lastIndexOf(const String &s2, unsigned int fromIndex) const`
`518`	`518`	`{`
`519`	`519`	`if (s2.len == 0 \|\| len == 0 \|\| s2.len > len \|\| fromIndex < 0) return -1;`
`520`	`520`	`if (fromIndex >= len) fromIndex = len - 1;`
`521`	`521`	`int found = -1;`
`522`	`522`	`for (char *p = buffer; p <= buffer + fromIndex; p++) {`
`523`	`523`	`p = strstr(p, s2.buffer);`
`524`	`524`	`if (!p) break;`
`525`		`- if (p - buffer <= fromIndex) found = p - buffer;`
	`525`	`+ if ((unsigned int)(p - buffer) <= fromIndex) found = p - buffer;`
`526`	`526`	`}`
`527`	`527`	`return found;`
`528`	`528`	`}`