From aa655b9ee13b2d26de7a633049e20742b7393e52 Mon Sep 17 00:00:00 2001
From: cremno <cremno@mail.ru>
Date: Tue, 7 Jan 2014 17:56:30 +0100
Subject: remove superfluous includes

- reduce compile time by a little bit (full-core: ~0.7s for me)
- thanks to 'include-what-you-use' for some help
- include Standard C header files before any other (coding style)
---
 src/array.c     | 1 -
 src/backtrace.c | 2 +-
 src/class.c     | 4 ++--
 src/dump.c      | 3 +--
 src/error.c     | 2 --
 src/etc.c       | 2 --
 src/gc.c        | 1 -
 src/object.c    | 2 --
 src/state.c     | 1 -
 src/symbol.c    | 1 -
 src/variable.c  | 4 +---
 src/vm.c        | 2 --
 12 files changed, 5 insertions(+), 20 deletions(-)

(limited to 'src')

diff --git a/src/array.c b/src/array.c
index 67351bb9b..0fcbffcd8 100644
--- a/src/array.c
+++ b/src/array.c
@@ -4,7 +4,6 @@
 ** See Copyright Notice in mruby.h
 */
 
-#include <limits.h>
 #include "mruby.h"
 #include "mruby/array.h"
 #include "mruby/class.h"
diff --git a/src/backtrace.c b/src/backtrace.c
index 76b5961b9..8edc27776 100644
--- a/src/backtrace.c
+++ b/src/backtrace.c
@@ -4,6 +4,7 @@
 ** See Copyright Notice in mruby.h
 */
 
+#include <stdarg.h>
 #include "mruby.h"
 #include "mruby/variable.h"
 #include "mruby/proc.h"
@@ -11,7 +12,6 @@
 #include "mruby/string.h"
 #include "mruby/class.h"
 #include "mruby/debug.h"
-#include <stdarg.h>
 
 typedef void (*output_stream_func)(mrb_state*, void*, int, const char*, ...);
 
diff --git a/src/class.c b/src/class.c
index d29089253..4f246655e 100644
--- a/src/class.c
+++ b/src/class.c
@@ -4,9 +4,9 @@
 ** See Copyright Notice in mruby.h
 */
 
-#include "mruby.h"
-#include <stdarg.h>
 #include <ctype.h>
+#include <stdarg.h>
+#include "mruby.h"
 #include "mruby/array.h"
 #include "mruby/class.h"
 #include "mruby/numeric.h"
diff --git a/src/dump.c b/src/dump.c
index 204e441d1..37cafb134 100644
--- a/src/dump.c
+++ b/src/dump.c
@@ -4,10 +4,9 @@
 ** See Copyright Notice in mruby.h
 */
 
+#include <ctype.h>
 #include <string.h>
 #include "mruby/dump.h"
-#include <ctype.h>
-
 #include "mruby/string.h"
 #include "mruby/irep.h"
 #include "mruby/numeric.h"
diff --git a/src/error.c b/src/error.c
index ced50e3e1..68278f426 100644
--- a/src/error.c
+++ b/src/error.c
@@ -7,10 +7,8 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <stdlib.h>
-#include <string.h>
 #include "mruby.h"
 #include "mruby/array.h"
-#include "mruby/class.h"
 #include "mruby/irep.h"
 #include "mruby/proc.h"
 #include "mruby/string.h"
diff --git a/src/etc.c b/src/etc.c
index 82394891f..8d19a1eab 100644
--- a/src/etc.c
+++ b/src/etc.c
@@ -6,8 +6,6 @@
 
 #include "mruby.h"
 #include "mruby/string.h"
-#include "error.h"
-#include "mruby/numeric.h"
 #include "mruby/data.h"
 #include "mruby/class.h"
 
diff --git a/src/gc.c b/src/gc.c
index 9245adbfb..63301d5cd 100644
--- a/src/gc.c
+++ b/src/gc.c
@@ -4,7 +4,6 @@
 ** See Copyright Notice in mruby.h
 */
 
-#include <limits.h>
 #include <string.h>
 #include <stdlib.h>
 #include "mruby.h"
diff --git a/src/object.c b/src/object.c
index daa76a03f..ce7489070 100644
--- a/src/object.c
+++ b/src/object.c
@@ -5,11 +5,9 @@
 */
 
 #include "mruby.h"
-#include "mruby/array.h"
 #include "mruby/class.h"
 #include "mruby/numeric.h"
 #include "mruby/string.h"
-#include "error.h"
 
 mrb_bool
 mrb_obj_eq(mrb_state *mrb, mrb_value v1, mrb_value v2)
diff --git a/src/state.c b/src/state.c
index f25d8c8bf..a8853fe72 100644
--- a/src/state.c
+++ b/src/state.c
@@ -7,7 +7,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include "mruby.h"
-#include "mruby/class.h"
 #include "mruby/irep.h"
 #include "mruby/variable.h"
 #include "mruby/debug.h"
diff --git a/src/symbol.c b/src/symbol.c
index 4e78ade66..4d6a8eb7a 100644
--- a/src/symbol.c
+++ b/src/symbol.c
@@ -5,7 +5,6 @@
 */
 
 #include <ctype.h>
-#include <limits.h>
 #include <string.h>
 #include "mruby.h"
 #include "mruby/khash.h"
diff --git a/src/variable.c b/src/variable.c
index 921d465a2..5ced2dfbd 100644
--- a/src/variable.c
+++ b/src/variable.c
@@ -4,14 +4,12 @@
 ** See Copyright Notice in mruby.h
 */
 
+#include <ctype.h>
 #include "mruby.h"
 #include "mruby/array.h"
 #include "mruby/class.h"
 #include "mruby/proc.h"
 #include "mruby/string.h"
-#include "mruby/variable.h"
-#include "error.h"
-#include <ctype.h>
 
 typedef int (iv_foreach_func)(mrb_state*,mrb_sym,mrb_value,void*);
 
diff --git a/src/vm.c b/src/vm.c
index 69f01fe1e..a12763b33 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -4,7 +4,6 @@
 ** See Copyright Notice in mruby.h
 */
 
-#include <string.h>
 #include <setjmp.h>
 #include <stddef.h>
 #include <stdarg.h>
@@ -13,7 +12,6 @@
 #include "mruby/class.h"
 #include "mruby/hash.h"
 #include "mruby/irep.h"
-#include "mruby/numeric.h"
 #include "mruby/proc.h"
 #include "mruby/range.h"
 #include "mruby/string.h"
-- 
cgit v1.2.3


From 84e9c4befe071d95ff36baf2faf76a7a6d52bc1e Mon Sep 17 00:00:00 2001
From: cremno <cremno@mail.ru>
Date: Tue, 7 Jan 2014 18:15:45 +0100
Subject: string.c: remove str_mod_check

Clang 3.4 emits '-Wunused-function' - and it's really unused!
But according to the description this seems to be a bug:

>Warn whenever a static function is declared but not defined or
>a non-inline static function is unused. This warning is enabled by
-Wall.

Source: <http://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html>
---
 src/string.c | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'src')

diff --git a/src/string.c b/src/string.c
index e8c37180d..7d0cdaf0d 100644
--- a/src/string.c
+++ b/src/string.c
@@ -107,16 +107,6 @@ mrb_str_resize(mrb_state *mrb, mrb_value str, mrb_int len)
   return str;
 }
 
-static inline void
-str_mod_check(mrb_state *mrb, mrb_value str, char *p, mrb_int len)
-{
-  struct RString *s = mrb_str_ptr(str);
-
-  if (s->ptr != p || s->len != len) {
-    mrb_raise(mrb, E_RUNTIME_ERROR, "string modified");
-  }
-}
-
 #define mrb_obj_alloc_string(mrb) ((struct RString*)mrb_obj_alloc((mrb), MRB_TT_STRING, (mrb)->string_class))
 
 /* char offset to byte offset */
-- 
cgit v1.2.3