New upstream version 1.0.32upstream/1.0.32

10 files changed, 15 insertions, 30 deletions

diff --git a/lib/getopt.c b/lib/getopt.c
index 9dabb82..e96560e 100644
--- a/lib/getopt.c
+++ b/lib/getopt.c
@@ -17,9 +17,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library.
+   If not, see <https://www.gnu.org/licenses/>.  */
 # include <config.h>
 #if !defined(HAVE_GETOPT_H) || !defined(HAVE_GETOPT_LONG)
 
diff --git a/lib/getopt1.c b/lib/getopt1.c
index 5ace00a..baa6a37 100644
--- a/lib/getopt1.c
+++ b/lib/getopt1.c
@@ -14,9 +14,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library.
+   If not, see <https://www.gnu.org/licenses/>.  */
 #include <config.h>
 #if !defined(HAVE_GETOPT_H) || !defined(HAVE_GETOPT_LONG)
 
diff --git a/lib/md5.c b/lib/md5.c
index 923a17c..809611a 100644
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -14,9 +14,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library.
+   If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.  */
 
@@ -26,14 +25,8 @@
 
 #include <sys/types.h>
 
-#if STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-# include <string.h>
-#else
-# ifndef HAVE_MEMCPY
-#  define memcpy(d, s, n) bcopy ((s), (d), (n))
-# endif
-#endif
+#include <stdlib.h>
+#include <string.h>
 
 #include "md5.h"
 
diff --git a/lib/sigprocmask.c b/lib/sigprocmask.c
index f754987..199823e 100644
--- a/lib/sigprocmask.c
+++ b/lib/sigprocmask.c
@@ -13,8 +13,7 @@ Library General Public License for more details.
 
 You should have received a copy of the GNU Library General Public
 License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+not, see <https://www.gnu.org/licenses/>.  */
 
 #include "../include/sane/config.h"
 
diff --git a/lib/snprintf.c b/lib/snprintf.c
index cdf6513..56ef5a2 100644
--- a/lib/snprintf.c
+++ b/lib/snprintf.c
@@ -549,7 +549,7 @@
 	union value *value, int base, int dosign,
 	int ljust, int len, int zpad, int precision );
 #endif
- static void fmtdouble( char **bufer, int *left,
+ static void fmtdouble( char **buffer, int *left,
 	int fmt, double value,
 	int ljust, int len, int zpad, int precision );
  static void dostr(  char **buffer, int *left, char *str );
diff --git a/lib/strcasestr.c b/lib/strcasestr.c
index 1c8dc87..e217b09 100644
--- a/lib/strcasestr.c
+++ b/lib/strcasestr.c
@@ -14,8 +14,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   see <https://www.gnu.org/licenses/>.  */
 
 /*
  * My personal strstr() implementation that beats most other algorithms.
diff --git a/lib/strdup.c b/lib/strdup.c
index fa6c5ab..d3f0396 100644
--- a/lib/strdup.c
+++ b/lib/strdup.c
@@ -13,8 +13,7 @@ Library General Public License for more details.
 
 You should have received a copy of the GNU Library General Public
 License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+not, see <https://www.gnu.org/licenses/>.  */
 
 #include "../include/sane/config.h"
 
diff --git a/lib/strndup.c b/lib/strndup.c
index 38147f0..484aee8 100644
--- a/lib/strndup.c
+++ b/lib/strndup.c
@@ -13,8 +13,7 @@ Library General Public License for more details.
 
 You should have received a copy of the GNU Library General Public
 License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+not, see <https://www.gnu.org/licenses/>.  */
 
 #include "../include/sane/config.h"
 
diff --git a/lib/strsep.c b/lib/strsep.c
index e6018e1..a780eca 100644
--- a/lib/strsep.c
+++ b/lib/strsep.c
@@ -13,8 +13,7 @@ Library General Public License for more details.
 
 You should have received a copy of the GNU Library General Public
 License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+not, see <https://www.gnu.org/licenses/>.  */
 
 #include "../include/sane/config.h"
 
diff --git a/lib/usleep.c b/lib/usleep.c
index e4ef453..2a4d10e 100644
--- a/lib/usleep.c
+++ b/lib/usleep.c
@@ -13,8 +13,7 @@ Library General Public License for more details.
 
 You should have received a copy of the GNU Library General Public
 License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+not, see <https://www.gnu.org/licenses/>.  */
 
 #include "../include/sane/config.h"