[Guile-commits] 01/03: Remove unused C variables and functions.

[Ludovic Courtès]

civodul pushed a commit to branch stable-2.0
in repository guile.

commit 6b73c87f58dbd36c82affde58b286a90b09bce9a
Author: Ludovic Courtès <address@hidden>
Date:   Sun May 8 21:33:37 2016 +0200

    Remove unused C variables and functions.
    
    Reported by GCC 6.1.0.
    
    * libguile/expand.c (s_empty_combination, s_missing_body_expression)
    (s_mixed_body_forms, s_bad_case_clause, s_bad_case_labels)
    (s_duplicate_case_label, s_bad_exit_clause, s_splicing)
    (s_bad_slot_number): Remove.
    * libguile/ports.c (scm_utf8_bom, scm_utf16be_bom, scm_utf32be_bom):
    Remove.
    * libguile/vm.c (vm_error_stack_underflow): Remove.
---
 libguile/expand.c |   14 ++------------
 libguile/ports.c  |    5 +----
 libguile/vm.c     |   11 ++---------
 3 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/libguile/expand.c b/libguile/expand.c
index cae5520..546b1e4 100644
--- a/libguile/expand.c
+++ b/libguile/expand.c
@@ -1,6 +1,5 @@
-/* Copyright (C) 
1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2012
- * Free Software Foundation, Inc.
- * 
+/* Copyright (C) 1995-2010, 2012, 2016 Free Software Foundation, Inc.
+ *
  * 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 3 of
@@ -104,27 +103,18 @@ static const char s_bad_expression[] = "Bad expression";
 static const char s_expression[] = "Missing or extra expression in";
 static const char s_missing_expression[] = "Missing expression in";
 static const char s_extra_expression[] = "Extra expression in";
-static const char s_empty_combination[] = "Illegal empty combination";
-static const char s_missing_body_expression[] = "Missing body expression in";
-static const char s_mixed_body_forms[] = "Mixed definitions and expressions 
in";
 static const char s_bad_define[] = "Bad define placement";
 static const char s_missing_clauses[] = "Missing clauses";
 static const char s_misplaced_else_clause[] = "Misplaced else clause";
-static const char s_bad_case_clause[] = "Bad case clause";
-static const char s_bad_case_labels[] = "Bad case labels";
-static const char s_duplicate_case_label[] = "Duplicate case label";
 static const char s_bad_cond_clause[] = "Bad cond clause";
 static const char s_missing_recipient[] = "Missing recipient in";
 static const char s_bad_variable[] = "Bad variable";
 static const char s_bad_bindings[] = "Bad bindings";
 static const char s_bad_binding[] = "Bad binding";
 static const char s_duplicate_binding[] = "Duplicate binding";
-static const char s_bad_exit_clause[] = "Bad exit clause";
 static const char s_bad_formals[] = "Bad formals";
 static const char s_bad_formal[] = "Bad formal";
 static const char s_duplicate_formal[] = "Duplicate formal";
-static const char s_splicing[] = "Non-list result for unquote-splicing";
-static const char s_bad_slot_number[] = "Bad slot number";
 
 static void syntax_error (const char* const, const SCM, const SCM) 
SCM_NORETURN;
 
diff --git a/libguile/ports.c b/libguile/ports.c
index 8799aca..d7459b3 100644
--- a/libguile/ports.c
+++ b/libguile/ports.c
@@ -1,6 +1,6 @@
 /* Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2006,
  *   2007, 2008, 2009, 2010, 2011, 2012, 2013,
- *   2014, 2015 Free Software Foundation, Inc.
+ *   2014, 2015, 2016 Free Software Foundation, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -2400,10 +2400,7 @@ looking_at_bytes (SCM port, const unsigned char *bytes, 
int len)
   return (i == len);
 }
 
-static const unsigned char scm_utf8_bom[3]    = {0xEF, 0xBB, 0xBF};
-static const unsigned char scm_utf16be_bom[2] = {0xFE, 0xFF};
 static const unsigned char scm_utf16le_bom[2] = {0xFF, 0xFE};
-static const unsigned char scm_utf32be_bom[4] = {0x00, 0x00, 0xFE, 0xFF};
 static const unsigned char scm_utf32le_bom[4] = {0xFF, 0xFE, 0x00, 0x00};
 
 /* Decide what byte order to use for a UTF-16 port.  Return "UTF-16BE"
diff --git a/libguile/vm.c b/libguile/vm.c
index d4c8b5f..03263ac 100644
--- a/libguile/vm.c
+++ b/libguile/vm.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 2001, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, 
Inc.
- * 
+/* Copyright (C) 2001, 2009-2013, 2016 Free Software Foundation, Inc.
+ *
  * 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 3 of
@@ -391,7 +391,6 @@ static void vm_error_too_many_args (int nargs) SCM_NORETURN;
 static void vm_error_wrong_num_args (SCM proc) SCM_NORETURN;
 static void vm_error_wrong_type_apply (SCM proc) SCM_NORETURN;
 static void vm_error_stack_overflow (struct scm_vm *vp) SCM_NORETURN;
-static void vm_error_stack_underflow (void) SCM_NORETURN;
 static void vm_error_improper_list (SCM x) SCM_NORETURN;
 static void vm_error_not_a_pair (const char *subr, SCM x) SCM_NORETURN;
 static void vm_error_not_a_bytevector (const char *subr, SCM x) SCM_NORETURN;
@@ -535,12 +534,6 @@ vm_error_stack_overflow (struct scm_vm *vp)
 }
 
 static void
-vm_error_stack_underflow (void)
-{
-  vm_error ("VM: Stack underflow", SCM_UNDEFINED);
-}
-
-static void
 vm_error_improper_list (SCM x)
 {
   vm_error ("Expected a proper list, but got object with tail ~s", x);