Hello community, here is the log from the commit of package libgsm for openSUSE:Factory checked in at 2019-02-27 15:04:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libgsm (Old) and /work/SRC/openSUSE:Factory/.libgsm.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libgsm" Wed Feb 27 15:04:47 2019 rev:25 rq:678569 version:1.0.18 Changes: -------- --- /work/SRC/openSUSE:Factory/libgsm/libgsm.changes 2015-11-22 10:58:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libgsm.new.28833/libgsm.changes 2019-02-27 15:04:52.182469859 +0100 @@ -1,0 +2,23 @@ +Sat Feb 23 20:06:39 UTC 2019 - [email protected] + +- Update to version 1.0.18 + * Remove the MacOS "quarantine" files that I didn't know I'd + shipped. + * Remove some trailing spaces. + * Bump up the patchlevel in inc/gsm.h (I'd forgotten that in + release 17.) +- Changes from version 1.0.17 + * New email addresses in the README. + * Avoid left-shifting signed integers. + * Don't print longwords using %d or %ld, cast them to (long) + first. + * Don't compare longwords as longs in addtest, we only care for + the lower 32 bits. (The math works, but the test failed). +- Changes from version 1.0.16 + * New email addresses in the manual pages (patch 16). + * Removed a stray .orig file (in patch 15). +- Rebase libgsm-1.0.13.patch. +- Drop libgsm-strict-aliasing.patch: Applied upstream. +- Drop ancient Obsoletes/Provides. + +------------------------------------------------------------------- Old: ---- gsm-1.0.14.tar.gz libgsm-strict-aliasing.patch New: ---- gsm-1.0.18.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgsm.spec ++++++ --- /var/tmp/diff_new_pack.nX5cPt/_old 2019-02-27 15:04:54.810469090 +0100 +++ /var/tmp/diff_new_pack.nX5cPt/_new 2019-02-27 15:04:54.838469082 +0100 @@ -1,7 +1,7 @@ # # spec file for package libgsm # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,15 +12,15 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: libgsm %define _name gsm -Version: 1.0.14 +Version: 1.0.18 Release: 0 -%define _version 1.0-pl14 +%define _version 1.0-pl18 Summary: GSM 06.10 Lossy Speech Compressor Library and Utilities License: ISC Group: Productivity/Multimedia/Sound/Editors and Convertors @@ -31,7 +31,6 @@ Patch: %{name}-1.0.13.patch Patch1: libgsm-paths.patch Patch2: libgsm-include.patch -Patch3: libgsm-strict-aliasing.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -43,9 +42,6 @@ %package -n libgsm1 Summary: GSM 06.10 Lossy Speech Compressor Library and Utilities Group: Productivity/Multimedia/Sound/Editors and Convertors -# Last appeared in OpenSUSE 10.3: -Provides: %{name} = %{version} -Obsoletes: %{name} < %{version} %description -n libgsm1 Contains the library for a GSM speech compressor. @@ -59,8 +55,6 @@ %package utils Summary: GSM 06.10 Lossy Speech Compressor Library and Utilities Group: Productivity/Multimedia/Sound/Editors and Convertors -# Last appeared in OpenSUSE 10.3: -Provides: %{name}:%{_bindir}/toast %description utils Contains binaries for a GSM speech compressor, verified against the @@ -96,7 +90,6 @@ %patch -p1 %patch1 %patch2 -%patch3 %build make CCFLAGS="-c $RPM_OPT_FLAGS -D_POSIX_SOURCE -D_BSD_SOURCE -DNeedFunctionPrototypes=1" lib/libgsm.a @@ -115,7 +108,6 @@ %{__rm} -f %{buildroot}%{_libdir}/*.a %post -n libgsm1 -p /sbin/ldconfig - %postun -n libgsm1 -p /sbin/ldconfig %files utils @@ -125,7 +117,8 @@ %files -n libgsm1 %defattr (-, root, root) -%doc COPYRIGHT ChangeLog MACHINES README +%license COPYRIGHT +%doc ChangeLog MACHINES README %{_libdir}/*.so.* %files devel ++++++ gsm-1.0.14.tar.gz -> gsm-1.0.18.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gsm-1.0-pl14/ChangeLog new/gsm-1.0-pl18/ChangeLog --- old/gsm-1.0-pl14/ChangeLog 2009-04-05 16:54:51.000000000 +0200 +++ new/gsm-1.0-pl18/ChangeLog 2018-05-06 04:57:47.000000000 +0200 @@ -1,3 +1,25 @@ +Sat May 5 21:48:20 2018 + + * Release 1.0 Patchlevel 18 + Remove the MacOS "quarantine" files that I didn't know I'd shipped. + Remove some trailing spaces. + Bump up the patchlevel in inc/gsm.h (I'd forgotten that in release 17.) + +Tue Jun 27 17:59:30 2017 + + * Release 1.0 Patchlevel 17 + New email addresses in the README. + Avoid left-shifting signed integers. + Don't print longwords using %d or %ld, cast them to (long) first. + Don't compare longwords as longs in addtest, we only care for the + lower 32 bits. (The math works, but the test failed.) + +Sat Sep 17 14:50:55 2016 + + * Release 1.0 Patchlevel 16 + New email addresses in the manual pages (patch 16) + Removed a stray .orig file (in patch 15) + Sun Apr 5 04:53:07 2009 Jutta Degener ([email protected]) * Release 1.0 Patchlevel 13 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gsm-1.0-pl14/Makefile new/gsm-1.0-pl18/Makefile --- old/gsm-1.0-pl14/Makefile 2006-04-26 21:14:26.000000000 +0200 +++ new/gsm-1.0-pl18/Makefile 2018-05-06 04:07:28.000000000 +0200 @@ -44,7 +44,7 @@ # CCFLAGS = -c -O CC = gcc -ansi -pedantic -CCFLAGS = -c -O2 -DNeedFunctionPrototypes=1 +CCFLAGS = -c -O2 -DNeedFunctionPrototypes=1 -Wall -Wno-comment LD = $(CC) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gsm-1.0-pl14/README new/gsm-1.0-pl18/README --- old/gsm-1.0-pl14/README 2006-04-26 21:14:26.000000000 +0200 +++ new/gsm-1.0-pl18/README 2018-05-06 04:07:28.000000000 +0200 @@ -25,8 +25,8 @@ on most SPARCstations. The implementation has been verified against the ETSI standard test patterns. -Jutta Degener ([email protected]) -Carsten Bormann ([email protected]) +Jutta Degener (then [email protected], nowadays [email protected]) +Carsten Bormann (then [email protected], nowadays [email protected]) Communications and Operating Systems Research Group, TU Berlin Fax: +49.30.31425156, Phone: +49.30.31424315 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gsm-1.0-pl14/add-test/add_test.c new/gsm-1.0-pl18/add-test/add_test.c --- old/gsm-1.0-pl14/add-test/add_test.c 2006-04-26 21:14:25.000000000 +0200 +++ new/gsm-1.0-pl18/add-test/add_test.c 2018-05-06 04:53:58.000000000 +0200 @@ -9,6 +9,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <unistd.h> #include "gsm.h" @@ -29,14 +30,13 @@ longword M_gsm_L_mult P((word op1, word op2)); longword M_gsm_L_add P((longword op1, longword op2)); -help() +void help() { puts( " add a b sub a b mult a b div a b" ); puts( "L_add A B L_sub A B L_mult A B mult_r a b" ); puts( "" ); puts( "abs a norm a >> a b << a b" ); puts( " L_>> A B L_<< A B" ); - } char * strtek P2((str, sep), char * str, char * sep) { @@ -96,18 +96,18 @@ char * parse P1((buf), char * buf) { char * s, * a; - long l; - if (a = strchr(buf, '=')) *a++ = 0; + if ((a = strchr(buf, '=')) != 0) *a++ = 0; - opname = s = strtek(buf, " \t("); + opname = s = strtek(buf, " \t("); if (!s) return (char *)0; op1 = op2 = L_op1 = L_op2 = 0; - if (s = strtek( (char *)0, "( \t,")) { + if ((s = strtek( (char *)0, "( \t,")) != 0) { op1 = L_op1 = value(s); - if (s = strtek( (char *)0, ", \t)")) op2 = L_op2 = value(s); + if ((s = strtek( (char *)0, ", \t)")) != 0) + op2 = L_op2 = value(s); } if (a) { @@ -136,10 +136,10 @@ void fprint_longword P2((f, w), FILE * f, longword w) { if (!w) putc('0', f); - else fprintf(f, "0x%8.8x (%ld%s)", - w, w, w == MIN_WORD ? "/-" + else fprintf(f, "0x%8.8lx (%ld%s)", + (unsigned long)w, (long)w, w == MIN_WORD ? "/-" : (w == MAX_WORD ? "/+" - : (w == MIN_LONGWORD ? "/--" + : (w == MIN_LONGWORD ? "/--" : (w == MAX_LONGWORD ? "/++" : "")))); } @@ -152,10 +152,10 @@ { if (interactive) print_longword(w); if (do_expect) { - if (w != L_expect) { + if ((w & 0xfffffffful) != (L_expect & 0xfffffffful)) { if (!interactive) fprint_longword(stderr, w); fprintf(stderr, " != %s (%ld, %ld) -- expected ", - opname, L_op1, L_op2 ); + opname, (long)L_op1, (long)L_op2 ); fprint_longword(stderr, L_expect); putc( '\n', stderr ); } @@ -169,7 +169,7 @@ if (w != expect) { if (!interactive) fprint_word(stderr, w); fprintf(stderr, " != %s (%ld, %ld) -- expected ", - opname, L_op1, L_op2 ); + opname, (long)L_op1, (long)L_op2 ); fprint_word(stderr, expect); putc('\n', stderr); } @@ -205,7 +205,7 @@ if (interactive) fprintf(stderr, "? "); if (!fgets(buf, sizeof(buf), in)) exit(0); - if (c = strchr(buf, '\n')) *c = 0; + if ((c = strchr(buf, '\n')) != 0) *c = 0; if (*buf == ';' || *buf == '#') continue; if (*buf == '\'') { @@ -255,11 +255,11 @@ if (!strcmp(c, "abs" )) { do_word( gsm_abs(op1) ); continue; - } + } if (!strcmp(c, "M_abs" )) { do_word( M_gsm_abs(op1) ); continue; - } + } if (!strcmp(c, "div" )) { do_word( gsm_div( op1, op2 )); continue; @@ -267,11 +267,11 @@ if (!strcmp(c, "norm" )) { do_word( gsm_norm(L_op1)); continue; - } + } if (!strcmp(c, "<<" )) { do_word( gsm_asl( op1, op2)); continue; - } + } if (!strcmp(c, ">>" )) { do_word( gsm_asr( op1, op2 )); continue; @@ -287,19 +287,19 @@ if (!strcmp(c, "L_add" )) { do_longword( gsm_L_add( L_op1, L_op2 )); continue; - } + } if (!strcmp(c, "M_L_add" )) { do_longword( M_gsm_L_add( L_op1, L_op2 )); continue; - } + } if (!strcmp(c, "L_sub" )) { do_longword( gsm_L_sub( L_op1, L_op2 )); continue; - } + } if (!strcmp(c, "L_<<" )) { do_longword( gsm_L_asl( L_op1, L_op2 )); continue; - } + } if (!strcmp(c, "L_>>")) { do_longword( gsm_L_asr( L_op1, L_op2 )); continue; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gsm-1.0-pl14/inc/gsm.h new/gsm-1.0-pl18/inc/gsm.h --- old/gsm-1.0-pl14/inc/gsm.h 2006-04-26 21:14:25.000000000 +0200 +++ new/gsm-1.0-pl18/inc/gsm.h 2018-05-06 04:53:02.000000000 +0200 @@ -43,7 +43,7 @@ #define GSM_MAGIC 0xD /* 13 kbit/s RPE-LTP */ -#define GSM_PATCHLEVEL 10 +#define GSM_PATCHLEVEL 18 #define GSM_MINOR 0 #define GSM_MAJOR 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gsm-1.0-pl14/inc/gsm.h.orig new/gsm-1.0-pl18/inc/gsm.h.orig --- old/gsm-1.0-pl14/inc/gsm.h.orig 2006-04-26 21:14:25.000000000 +0200 +++ new/gsm-1.0-pl18/inc/gsm.h.orig 1970-01-01 01:00:00.000000000 +0100 @@ -1,71 +0,0 @@ -/* - * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische - * Universitaet Berlin. See the accompanying file "COPYRIGHT" for - * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE. - */ - -/*$Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/gsm.h,v 1.10 1996/07/02 10:15:22 jutta Exp $*/ - -#ifndef GSM_H -#define GSM_H - -#ifdef __cplusplus -# define NeedFunctionPrototypes 1 -#endif - -#if __STDC__ -# define NeedFunctionPrototypes 1 -#endif - -#ifdef _NO_PROTO -# undef NeedFunctionPrototypes -#endif - -#ifdef NeedFunctionPrototypes -# include <stdio.h> /* for FILE * */ -#endif - -#undef GSM_P -#if NeedFunctionPrototypes -# define GSM_P( protos ) protos -#else -# define GSM_P( protos ) ( /* protos */ ) -#endif - -/* - * Interface - */ - -typedef struct gsm_state * gsm; -typedef short gsm_signal; /* signed 16 bit */ -typedef unsigned char gsm_byte; -typedef gsm_byte gsm_frame[33]; /* 33 * 8 bits */ - -#define GSM_MAGIC 0xD /* 13 kbit/s RPE-LTP */ - -#define GSM_PATCHLEVEL 9 -#define GSM_MINOR 0 -#define GSM_MAJOR 1 - -#define GSM_OPT_VERBOSE 1 -#define GSM_OPT_FAST 2 -#define GSM_OPT_LTP_CUT 3 -#define GSM_OPT_WAV49 4 -#define GSM_OPT_FRAME_INDEX 5 -#define GSM_OPT_FRAME_CHAIN 6 - -extern gsm gsm_create GSM_P((void)); -extern void gsm_destroy GSM_P((gsm)); - -extern int gsm_print GSM_P((FILE *, gsm, gsm_byte *)); -extern int gsm_option GSM_P((gsm, int, int *)); - -extern void gsm_encode GSM_P((gsm, gsm_signal *, gsm_byte *)); -extern int gsm_decode GSM_P((gsm, gsm_byte *, gsm_signal *)); - -extern int gsm_explode GSM_P((gsm, gsm_byte *, gsm_signal *)); -extern void gsm_implode GSM_P((gsm, gsm_signal *, gsm_byte *)); - -#undef GSM_P - -#endif /* GSM_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gsm-1.0-pl14/inc/private.h new/gsm-1.0-pl18/inc/private.h --- old/gsm-1.0-pl14/inc/private.h 2006-04-26 21:17:01.000000000 +0200 +++ new/gsm-1.0-pl18/inc/private.h 2018-05-06 04:56:33.000000000 +0200 @@ -83,10 +83,10 @@ extern word gsm_asr P((word a, int n)); /* - * Inlined functions from add.h + * Inlined functions from add.h */ -/* +/* * #define GSM_MULT_R(a, b) (* word a, word b, !(a == b == MIN_WORD) *) \ * (0x0FFFF & SASR(((longword)(a) * (longword)(b) + 16384), 15)) */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gsm-1.0-pl14/man/bitter.1 new/gsm-1.0-pl18/man/bitter.1 --- old/gsm-1.0-pl14/man/bitter.1 2006-04-26 21:14:25.000000000 +0200 +++ new/gsm-1.0-pl18/man/bitter.1 2018-05-06 04:07:28.000000000 +0200 @@ -67,4 +67,4 @@ .SH NOTES This is a quick hack for the gsm_encode() and gsm_decode() routines. .SH BUGS -Please direct bug reports to [email protected] and [email protected]. +Please direct bug reports to [email protected] and [email protected]. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gsm-1.0-pl14/man/gsm.3 new/gsm-1.0-pl18/man/gsm.3 --- old/gsm-1.0-pl14/man/gsm.3 2006-04-26 21:14:25.000000000 +0200 +++ new/gsm-1.0-pl18/man/gsm.3 2018-05-06 04:07:28.000000000 +0200 @@ -100,6 +100,6 @@ } .nf .SH BUGS -Please direct bug reports to [email protected] and [email protected]. +Please direct bug reports to [email protected] and [email protected]. .SH "SEE ALSO" toast(1), gsm_print(3), gsm_explode(3), gsm_option(3) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gsm-1.0-pl14/man/gsm_explode.3 new/gsm-1.0-pl18/man/gsm_explode.3 --- old/gsm-1.0-pl14/man/gsm_explode.3 2006-04-26 21:14:25.000000000 +0200 +++ new/gsm-1.0-pl18/man/gsm_explode.3 2018-05-06 04:07:28.000000000 +0200 @@ -42,6 +42,6 @@ .SH "RETURN VALUE" gsm_explode() returns -1 if the passed frame is invalid, else 0. .SH BUGS -Please direct bug reports to [email protected] and [email protected]. +Please direct bug reports to [email protected] and [email protected]. .SH "SEE ALSO" gsm(3) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gsm-1.0-pl14/man/gsm_option.3 new/gsm-1.0-pl18/man/gsm_option.3 --- old/gsm-1.0-pl14/man/gsm_option.3 2006-04-26 21:14:25.000000000 +0200 +++ new/gsm-1.0-pl18/man/gsm_option.3 2018-05-06 04:07:28.000000000 +0200 @@ -178,6 +178,6 @@ gsm_option() returns -1 if an option is not supported, the previous value of the option otherwise. .SH BUGS -Please direct bug reports to [email protected] and [email protected]. +Please direct bug reports to [email protected] and [email protected]. .SH "SEE ALSO" toast(1), gsm(3), gsm_explode(3), gsm_print(3) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gsm-1.0-pl14/man/gsm_print.3 new/gsm-1.0-pl18/man/gsm_print.3 --- old/gsm-1.0-pl14/man/gsm_print.3 2006-04-26 21:14:25.000000000 +0200 +++ new/gsm-1.0-pl18/man/gsm_print.3 2018-05-06 04:07:28.000000000 +0200 @@ -47,6 +47,6 @@ 07 03 06 00 03 03 06 05 00 03 02 07 04 .nf .SH BUGS -Please direct bug reports to [email protected] and [email protected]. +Please direct bug reports to [email protected] and [email protected]. .SH "SEE ALSO" gsm(3), gsm_explode(3) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gsm-1.0-pl14/man/toast.1 new/gsm-1.0-pl18/man/toast.1 --- old/gsm-1.0-pl14/man/toast.1 2006-04-26 21:14:25.000000000 +0200 +++ new/gsm-1.0-pl18/man/toast.1 2018-05-06 04:07:28.000000000 +0200 @@ -149,7 +149,7 @@ for text, pictures or any other non-speech-data you consider valuable. .SH BUGS -Please direct bug reports to [email protected]. +Please direct bug reports to [email protected] and [email protected]. .SH "SEE ALSO" gsm(3) .\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gsm-1.0-pl14/src/add.c new/gsm-1.0-pl18/src/add.c --- old/gsm-1.0-pl14/src/add.c 2006-04-26 21:14:26.000000000 +0200 +++ new/gsm-1.0-pl18/src/add.c 2018-05-06 04:54:07.000000000 +0200 @@ -88,7 +88,7 @@ } else if (b <= 0) return a - b; else { - /* a<0, b>0 */ + /* a<0, b>0 */ ulongword A = (ulongword)-(a + 1) + b; return A >= MAX_LONGWORD ? MIN_LONGWORD : -(longword)A - 1; @@ -120,7 +120,7 @@ * variable L_var1 for positive values on the interval * * with minimum of - * minimum of 1073741824 (01000000000000000000000000000000) and + * minimum of 1073741824 (01000000000000000000000000000000) and * maximum of 2147483647 (01111111111111111111111111111111) * * @@ -141,7 +141,7 @@ a = ~a; } - return a & 0xffff0000 + return a & 0xffff0000 ? ( a & 0xff000000 ? -1 + bitoff[ 0xFF & (a >> 24) ] : 7 + bitoff[ 0xFF & (a >> 16) ] ) @@ -194,7 +194,7 @@ # endif } -/* +/* * (From p. 46, end of section 4.2.5) * * NOTE: The following lines gives [sic] one correct implementation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gsm-1.0-pl14/src/code.c new/gsm-1.0-pl18/src/code.c --- old/gsm-1.0-pl14/src/code.c 2015-02-20 20:19:14.000000000 +0100 +++ new/gsm-1.0-pl18/src/code.c 2018-05-06 04:54:14.000000000 +0200 @@ -20,8 +20,8 @@ #include "gsm.h" #include "proto.h" -/* - * 4.2 FIXED POINT IMPLEMENTATION OF THE RPE-LTP CODER +/* + * 4.2 FIXED POINT IMPLEMENTATION OF THE RPE-LTP CODER */ void Gsm_Coder P8((S,s,LARc,Nc,bc,Mc,xmaxc,xMc), @@ -34,7 +34,7 @@ * The RPE-LTD coder works on a frame by frame basis. The length of * the frame is equal to 160 samples. Some computations are done * once per frame to produce at the output of the coder the - * LARc[1..8] parameters which are the coded LAR coefficients and + * LARc[1..8] parameters which are the coded LAR coefficients and * also to realize the inverse filtering operation for the entire * frame (160 samples of signal d[0..159]). These parts produce at * the output of the coder: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gsm-1.0-pl14/src/debug.c new/gsm-1.0-pl18/src/debug.c --- old/gsm-1.0-pl14/src/debug.c 2006-04-26 21:14:26.000000000 +0200 +++ new/gsm-1.0-pl18/src/debug.c 2018-05-06 04:54:17.000000000 +0200 @@ -18,7 +18,7 @@ #include <stdio.h> #include "proto.h" -void gsm_debug_words P4( (name, from, to, ptr), +void gsm_debug_words P4( (name, from, to, ptr), char * name, int from, int to, @@ -49,7 +49,7 @@ fprintf( stderr, "%s [%d .. %d]: ", name, from, to ); while (from <= to) { - fprintf(stderr, "%d ", ptr[ from ] ); + fprintf(stderr, "%ld ", (long)ptr[ from ] ); from++; if (nprinted++ >= 7) { nprinted = 0; @@ -63,14 +63,14 @@ char * name, longword value ) { - fprintf(stderr, "%s: %d\n", name, (long)value ); + fprintf(stderr, "%s: %ld\n", name, (long)value ); } void gsm_debug_word P2( (name, value), char * name, word value ) { - fprintf(stderr, "%s: %d\n", name, (long)value); + fprintf(stderr, "%s: %ld\n", name, (long)value); } #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gsm-1.0-pl14/src/gsm_explode.c new/gsm-1.0-pl18/src/gsm_explode.c --- old/gsm-1.0-pl14/src/gsm_explode.c 2006-04-26 21:14:26.000000000 +0200 +++ new/gsm-1.0-pl18/src/gsm_explode.c 2018-05-06 04:54:20.000000000 +0200 @@ -273,7 +273,7 @@ xmc[51] = sr & 0x7; sr >>= 3; } } - else + else #endif { /* GSM_MAGIC = (*c >> 4) & 0xF; */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gsm-1.0-pl14/src/gsm_implode.c new/gsm-1.0-pl18/src/gsm_implode.c --- old/gsm-1.0-pl14/src/gsm_implode.c 2006-04-26 21:14:26.000000000 +0200 +++ new/gsm-1.0-pl18/src/gsm_implode.c 2018-05-06 04:54:23.000000000 +0200 @@ -367,7 +367,7 @@ } } else -#endif +#endif { *c++ = ((GSM_MAGIC & 0xF) << 4) /* 1 */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gsm-1.0-pl14/src/gsm_option.c new/gsm-1.0-pl18/src/gsm_option.c --- old/gsm-1.0-pl14/src/gsm_option.c 2006-04-26 21:14:26.000000000 +0200 +++ new/gsm-1.0-pl18/src/gsm_option.c 2018-05-06 04:54:26.000000000 +0200 @@ -56,7 +56,7 @@ case GSM_OPT_WAV49: -#ifdef WAV49 +#ifdef WAV49 result = r->wav_fmt; if (val) r->wav_fmt = !!*val; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gsm-1.0-pl14/src/long_term.c new/gsm-1.0-pl18/src/long_term.c --- old/gsm-1.0-pl14/src/long_term.c 2006-04-26 21:14:26.000000000 +0200 +++ new/gsm-1.0-pl18/src/long_term.c 2018-05-06 04:54:36.000000000 +0200 @@ -330,7 +330,7 @@ else scal = 6 - temp; assert(scal >= 0); - ltp_cut = (longword)SASR(dmax, scal) * st->ltp_cut / 100; + ltp_cut = (longword)SASR(dmax, scal) * st->ltp_cut / 100; /* Initialization of a working array wt @@ -362,7 +362,7 @@ register float a = lp[-8], b = lp[-7], c = lp[-6], d = lp[-5], e = lp[-4], f = lp[-3], g = lp[-2], h = lp[-1]; - register float E; + register float E; register float S0 = 0, S1 = 0, S2 = 0, S3 = 0, S4 = 0, S5 = 0, S6 = 0, S7 = 0, S8 = 0; @@ -528,7 +528,7 @@ register float a = lp[-8], b = lp[-7], c = lp[-6], d = lp[-5], e = lp[-4], f = lp[-3], g = lp[-2], h = lp[-1]; - register float E; + register float E; register float S0 = 0, S1 = 0, S2 = 0, S3 = 0, S4 = 0, S5 = 0, S6 = 0, S7 = 0, S8 = 0; @@ -742,7 +742,7 @@ register float a = lp[-8], b = lp[-7], c = lp[-6], d = lp[-5], e = lp[-4], f = lp[-3], g = lp[-2], h = lp[-1]; - register float E; + register float E; register float S0 = 0, S1 = 0, S2 = 0, S3 = 0, S4 = 0, S5 = 0, S6 = 0, S7 = 0, S8 = 0; @@ -860,7 +860,7 @@ case 0: STEP( 3277 ); break; case 1: STEP( 11469 ); break; case 2: STEP( 21299 ); break; - case 3: STEP( 32767 ); break; + case 3: STEP( 32767 ); break; } } @@ -881,7 +881,7 @@ assert( dpp); assert( Nc ); assert( bc ); #if defined(FAST) && defined(USE_FLOAT_MUL) - if (S->fast) + if (S->fast) #if defined (LTP_CUT) if (S->ltp_cut) Cut_Fast_Calculation_of_the_LTP_parameters(S, @@ -889,7 +889,7 @@ else #endif /* LTP_CUT */ Fast_Calculation_of_the_LTP_parameters(d, dp, bc, Nc ); - else + else #endif /* FAST & USE_FLOAT_MUL */ #ifdef LTP_CUT if (S->ltp_cut) @@ -930,7 +930,7 @@ */ brp = gsm_QLB[ bcr ]; - /* Computation of the reconstructed short term residual + /* Computation of the reconstructed short term residual * signal drp[0..39] */ assert(brp != MIN_WORD); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gsm-1.0-pl14/src/lpc.c new/gsm-1.0-pl18/src/lpc.c --- old/gsm-1.0-pl14/src/lpc.c 2006-04-26 21:14:26.000000000 +0200 +++ new/gsm-1.0-pl18/src/lpc.c 2018-05-06 04:54:43.000000000 +0200 @@ -69,7 +69,7 @@ float_s[k] = (float) \ (s[k] = GSM_MULT_R(s[k], 16384 >> (n-1)));\ break; -# else +# else # define SCALE(n) \ case n: for (k = 0; k <= 159; k++) \ s[k] = GSM_MULT_R( s[k], 16384 >> (n-1) );\ @@ -133,13 +133,13 @@ STEP(5); STEP(6); STEP(7); STEP(8); } - for (k = 9; k--; L_ACF[k] <<= 1) ; + for (k = 9; k--; L_ACF[k] <<= 1) ; } /* Rescaling of the array s[0..159] */ if (scalauto > 0) { - assert(scalauto <= 4); + assert(scalauto <= 4); for (k = 160; k--; *s++ <<= scalauto) ; } } @@ -224,7 +224,7 @@ assert(*r >= 0); if (P[1] > 0) *r = -*r; /* r[n] = sub(0, r[n]) */ assert (*r != MIN_WORD); - if (n == 8) return; + if (n == 8) return; /* Schur recursion */ @@ -294,7 +294,7 @@ /* This procedure needs four tables; the following equations * give the optimum scaling for the constants: - * + * * A[0..7] = integer( real_A[0..7] * 1024 ) * B[0..7] = integer( real_B[0..7] * 512 ) * MAC[0..7] = maximum of the LARc[0..7] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gsm-1.0-pl14/src/preprocess.c new/gsm-1.0-pl18/src/preprocess.c --- old/gsm-1.0-pl14/src/preprocess.c 2006-04-26 21:14:26.000000000 +0200 +++ new/gsm-1.0-pl18/src/preprocess.c 2018-05-06 04:54:49.000000000 +0200 @@ -15,7 +15,7 @@ #include "proto.h" /* 4.2.0 .. 4.2.3 PREPROCESSING SECTION - * + * * After A-law to linear conversion (or directly from the * Ato D converter) the following scaling is assumed for * input to the RPE-LTP algorithm: @@ -26,7 +26,7 @@ * Where S is the sign bit, v a valid bit, and * a "don't care" bit. * The original signal is called sop[..] * - * out: 0.1................... 12 + * out: 0.1................... 12 * S.S.v.v.v.v.v.v.v.v.v.v.v.v.0.0 */ @@ -66,7 +66,7 @@ /* 4.2.2 Offset compensation - * + * * This part implements a high-pass filter and requires extended * arithmetic precision for the recursive part of this filter. * The input of this procedure is the array so[0...159] and the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gsm-1.0-pl14/src/rpe.c new/gsm-1.0-pl18/src/rpe.c --- old/gsm-1.0-pl14/src/rpe.c 2006-04-26 21:14:26.000000000 +0200 +++ new/gsm-1.0-pl18/src/rpe.c 2018-05-06 04:54:56.000000000 +0200 @@ -27,7 +27,7 @@ * The coefficients of the weighting filter are stored in a table * (see table 4.4). The following scaling is used: * - * H[0..10] = integer( real_H[ 0..10] * 8192 ); + * H[0..10] = integer( real_H[ 0..10] * 8192 ); */ { /* word wt[ 50 ]; */ @@ -48,7 +48,7 @@ e -= 5; /* Compute the signal x[0..39] - */ + */ for (k = 0; k <= 39; k++) { L_result = 8192 >> 1; @@ -63,7 +63,7 @@ #define STEP( i, H ) (e[ k + i ] * (longword)H) /* Every one of these multiplications is done twice -- - * but I don't see an elegant way to optimize this. + * but I don't see an elegant way to optimize this. * Do you? */ @@ -81,16 +81,16 @@ L_result += STEP( 10, -134 ) ; #else L_result += - STEP( 0, -134 ) - + STEP( 1, -374 ) + STEP( 0, -134 ) + + STEP( 1, -374 ) /* + STEP( 2, 0 ) */ - + STEP( 3, 2054 ) - + STEP( 4, 5741 ) - + STEP( 5, 8192 ) - + STEP( 6, 5741 ) - + STEP( 7, 2054 ) + + STEP( 3, 2054 ) + + STEP( 4, 5741 ) + + STEP( 5, 8192 ) + + STEP( 6, 5741 ) + + STEP( 7, 2054 ) /* + STEP( 8, 0 ) */ - + STEP( 9, -374 ) + + STEP( 9, -374 ) + STEP(10, -134 ) ; #endif @@ -114,7 +114,7 @@ /* 4.2.14 */ static void RPE_grid_selection P3((x,xM,Mc_out), - word * x, /* [0..39] IN */ + word * x, /* [0..39] IN */ word * xM, /* [0..12] OUT */ word * Mc_out /* OUT */ ) @@ -147,7 +147,7 @@ * L_temp = GSM_L_MULT( temp1, temp1 ); * L_result = GSM_L_ADD( L_temp, L_result ); * } - * + * * if (L_result > EM) { * Mc = m; * EM = L_result; @@ -310,7 +310,7 @@ * can be calculated by using the exponent and the mantissa part of * xmaxc (logarithmic table). * So, this method avoids any division and uses only a scaling - * of the RPE samples by a function of the exponent. A direct + * of the RPE samples by a function of the exponent. A direct * multiplication by the inverse of the mantissa (NRFAC[0..7] * found in table 4.5) gives the 3 bit coded version xMc[0..12] * of the RPE samples. @@ -321,7 +321,7 @@ */ assert( exp <= 4096 && exp >= -4096); - assert( mant >= 0 && mant <= 7 ); + assert( mant >= 0 && mant <= 7 ); temp1 = 6 - exp; /* normalization by the exponent */ temp2 = gsm_NRFAC[ mant ]; /* inverse mantissa */ @@ -351,7 +351,7 @@ word mant, word exp, register word * xMp) /* [0..12] OUT */ -/* +/* * This part is for decoding the RPE sequence of coded xMc[0..12] * samples to obtain the xMp[0..12] array. Table 4.6 is used to get * the mantissa of xmaxc (FAC[0..7]). @@ -361,7 +361,7 @@ word temp, temp1, temp2, temp3; longword ltmp; - assert( mant >= 0 && mant <= 7 ); + assert( mant >= 0 && mant <= 7 ); temp1 = gsm_FAC[ mant ]; /* see 4.2-15 for mant */ temp2 = gsm_sub( 6, exp ); /* see 4.2-15 for exp */ @@ -438,7 +438,7 @@ { int k; - for (k = 0; k <= 79; k++) + for (k = 0; k <= 79; k++) dp[ -120 + k ] = dp[ -80 + k ]; for (k = 0; k <= 39; k++) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gsm-1.0-pl14/src/short_term.c new/gsm-1.0-pl18/src/short_term.c --- old/gsm-1.0-pl14/src/short_term.c 2006-04-26 21:14:26.000000000 +0200 +++ new/gsm-1.0-pl18/src/short_term.c 2018-05-06 04:55:02.000000000 +0200 @@ -51,21 +51,21 @@ */ #undef STEP -#define STEP( B, MIC, INVA ) \ +#define STEP( B_TIMES_TWO, MIC, INVA ) \ temp1 = GSM_ADD( *LARc++, MIC ) << 10; \ - temp1 = GSM_SUB( temp1, B << 1 ); \ + temp1 = GSM_SUB( temp1, B_TIMES_TWO ); \ temp1 = GSM_MULT_R( INVA, temp1 ); \ *LARpp++ = GSM_ADD( temp1, temp1 ); STEP( 0, -32, 13107 ); STEP( 0, -32, 13107 ); - STEP( 2048, -16, 13107 ); - STEP( -2560, -16, 13107 ); + STEP( 4096, -16, 13107 ); + STEP( -5120, -16, 13107 ); - STEP( 94, -8, 19223 ); - STEP( -1792, -8, 17476 ); - STEP( -341, -4, 31454 ); - STEP( -1144, -4, 29708 ); + STEP( 188, -8, 19223 ); + STEP( -3584, -8, 17476 ); + STEP( -682, -4, 31454 ); + STEP( -2288, -4, 29708 ); /* NOTE: the addition of *MIC is used to restore * the sign of *LARc. @@ -73,7 +73,7 @@ } /* 4.2.9 */ -/* Computation of the quantized reflection coefficients +/* Computation of the quantized reflection coefficients */ /* 4.2.9.1 Interpolation of the LARpp[1..8] to get the LARp[1..8] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gsm-1.0-pl14/src/table.c new/gsm-1.0-pl18/src/table.c --- old/gsm-1.0-pl14/src/table.c 2006-04-26 21:14:26.000000000 +0200 +++ new/gsm-1.0-pl18/src/table.c 2018-05-06 04:55:07.000000000 +0200 @@ -51,7 +51,7 @@ word gsm_H[11] = {-134, -374, 0, 2054, 5741, 8192, 5741, 2054, 0, -374, -134 }; -/* Table 4.5 Normalized inverse mantissa used to compute xM/xmax +/* Table 4.5 Normalized inverse mantissa used to compute xM/xmax */ /* i 0 1 2 3 4 5 6 7 */ word gsm_NRFAC[8] = { 29128, 26215, 23832, 21846, 20165, 18725, 17476, 16384 }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gsm-1.0-pl14/src/toast.c new/gsm-1.0-pl18/src/toast.c --- old/gsm-1.0-pl14/src/toast.c 2006-04-26 21:14:26.000000000 +0200 +++ new/gsm-1.0-pl18/src/toast.c 2018-05-06 04:55:27.000000000 +0200 @@ -34,7 +34,7 @@ * The function (*init_input)() begins input (e.g. skips a header). * * There are different versions of input, output, init_input and init_output - * for different formats understood by toast; which ones are used + * for different formats understood by toast; which ones are used * depends on the command line arguments and, in their absence, the * filename; the fallback is #defined in toast.h * @@ -71,7 +71,7 @@ generic_init, generic_init, ulaw_input, - ulaw_output + ulaw_output }, f_alaw = { "A-law", "8 kHz, 8 bit A-law encoding", ".A", @@ -146,7 +146,7 @@ /* If our _pathname_ is too long, we'll usually not be * able to open the file at all -- don't worry about that. - * + * * But if the _filename_ is too long, there is danger of * silent truncation on some systems, which results * in the target replacing the source! @@ -160,7 +160,7 @@ #else #ifdef _PC_NAME_MAX #ifdef USE_PATHCONF - { char * s, tmp; + { char * s, tmp; /* s = dirname(name) */ @@ -200,7 +200,7 @@ * Return a pointer the suffix of a string, if any. * A suffix alone has no suffix, an empty suffix can not be had. */ -static char * suffix P2((name, suf), char *name, char * suf) +static char * suffix P2((name, suf), char *name, char * suf) { size_t nlen = strlen(name); size_t slen = strlen(suf); @@ -211,7 +211,7 @@ } -static void catch_signals P1((fun), SIGHANDLER_T (*fun) ()) +static void catch_signals P1((fun), SIGHANDLER_T (*fun) ()) { #ifdef SIGHUP signal( SIGHUP, fun ); @@ -252,7 +252,7 @@ char * s; if (!(s = malloc(len))) { fprintf(stderr, "%s: failed to malloc %d bytes -- abort\n", - progname, len); + progname, (int)len); onintr(); exit(1); } @@ -270,7 +270,7 @@ maxlen = strlen(name) + 1 + strlen(want) + strlen(cut); p = strcpy(emalloc(maxlen), name); - if (s = suffix(p, cut)) strcpy(s, want); + if ((s = suffix(p, cut)) != 0) strcpy(s, want); else if (*want && !suffix(p, want)) strcat(p, want); return p; @@ -325,7 +325,7 @@ fprintf(stderr, "%s: could not change file mode of \"%s\"\n", progname, outname); } -#else +#else #ifdef HAS_CHMOD if (outname && chmod(outname, instat.st_mode & 07777)) { perror(outname); @@ -341,7 +341,7 @@ if (!instat.st_nlink) return; /* couldn't stat in */ #ifdef HAS_FCHOWN (void)fchown(fileno(out), instat.st_uid, instat.st_gid); -#else +#else #ifdef HAS_CHOWN (void)chown(outname, instat.st_uid, instat.st_gid); #endif /* HAS_CHOWN */ @@ -415,9 +415,10 @@ return 0; } if (st->st_nlink > 1 && !f_cat && !f_precious) { - fprintf(stderr, - "%s: \"%s\" has %s other link%s -- unchanged.\n", - progname,name,st->st_nlink - 1,"s" + (st->st_nlink<=2)); + fprintf(stderr, + "%s: \"%s\" has %d other link%s -- unchanged.\n", + progname, name, (int)(st->st_nlink - 1), + "s" + (st->st_nlink <= 2)); return 0; } return 1; @@ -497,7 +498,7 @@ out = stdout; outname = (char *)NULL; #ifdef HAS__FSETMODE - _fsetmode(out, "b"); + _fsetmode(out, "b"); #endif } else { @@ -531,7 +532,7 @@ gsm r; gsm_signal s[ 160 ]; gsm_frame d; - + int cc; if (!(r = gsm_create())) { @@ -571,7 +572,7 @@ gsm r; gsm_frame s; gsm_signal d[ 160 ]; - + int cc; if (!(r = gsm_create())) { /* malloc failed */ @@ -586,7 +587,7 @@ if (cc != sizeof(s)) { if (cc >= 0) fprintf(stderr, "%s: incomplete frame (%d byte%s missing) from %s\n", - progname, sizeof(s) - cc, + progname, (int)(sizeof(s) - cc), "s" + (sizeof(s) - cc == 1), inname ? inname : "stdin" ); gsm_destroy(r); @@ -594,7 +595,7 @@ return -1; } if (gsm_decode(r, s, d)) { - fprintf(stderr, "%s: bad frame in %s\n", + fprintf(stderr, "%s: bad frame in %s\n", progname, inname ? inname : "stdin"); gsm_destroy(r); errno = 0; @@ -624,8 +625,6 @@ static int process P1((name), char * name) { - int step = 0; - out = (FILE *)0; in = (FILE *)0; @@ -754,7 +753,6 @@ { int opt; extern int optind; - extern char * optarg; parse_argv0(*av); @@ -778,8 +776,7 @@ case 'v': version(); exit(0); case 'h': help(); exit(0); - default: - usage: + default: fprintf(stderr, "Usage: %s [-fcpdhvuaslFC] [files...] (-h for help)\n", progname); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gsm-1.0-pl14/src/toast_alaw.c new/gsm-1.0-pl18/src/toast_alaw.c --- old/gsm-1.0-pl14/src/toast_alaw.c 2006-04-26 21:14:26.000000000 +0200 +++ new/gsm-1.0-pl18/src/toast_alaw.c 2018-05-06 04:55:15.000000000 +0200 @@ -314,7 +314,7 @@ 90, 91, 88, 89, 94, 95, 92, 93, 82, 83, 80, 81, 86, 87, 84, 85 }; -int alaw_input P1((buf), gsm_signal * buf) +int alaw_input P1((buf), gsm_signal * buf) { int i, c; @@ -323,7 +323,7 @@ return i; } -int alaw_output P1((buf), gsm_signal * buf) +int alaw_output P1((buf), gsm_signal * buf) { int i; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gsm-1.0-pl14/src/toast_audio.c new/gsm-1.0-pl18/src/toast_audio.c --- old/gsm-1.0-pl14/src/toast_audio.c 2006-04-26 21:14:26.000000000 +0200 +++ new/gsm-1.0-pl18/src/toast_audio.c 2018-05-06 04:55:21.000000000 +0200 @@ -29,7 +29,7 @@ static int put_u32 P2((f, u), FILE * f, unsigned long u) { - /* Write a 32-bit unsigned value msb first. + /* Write a 32-bit unsigned value msb first. */ if ( putc( (char)((u>>24) & 0x0FF), f) == EOF || putc( (char)((u>>16) & 0x0FF), f) == EOF @@ -58,14 +58,14 @@ { unsigned long len, enc; /* unsigned 32 bits */ - if ( fgetc(in) != '.' + if ( fgetc(in) != '.' || fgetc(in) != 's' || fgetc(in) != 'n' || fgetc(in) != 'd' || get_u32( in, &len ) || get_u32( in, &enc ) /* skip this */ || get_u32( in, &enc )) { - fprintf(stderr, + fprintf(stderr, "%s: bad (missing?) header in Sun audio file \"%s\";\n\ Try one of -u, -a, -l instead (%s -h for help).\n", progname, inname ? inname : "stdin", progname); @@ -86,7 +86,7 @@ while (len > 4*4) if (getc(in) == EOF) { - fprintf(stderr, + fprintf(stderr, "%s: EOF in header of Sun audio file \"%s\";\n\ Try one of -u, -a, -l instead (%s -h for help).\n", progname, inname ? inname : "stdin", progname); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gsm-1.0-pl14/src/toast_lin.c new/gsm-1.0-pl18/src/toast_lin.c --- old/gsm-1.0-pl14/src/toast_lin.c 2006-04-26 21:14:26.000000000 +0200 +++ new/gsm-1.0-pl18/src/toast_lin.c 2018-05-06 04:55:33.000000000 +0200 @@ -18,7 +18,7 @@ return fread( (char *)buf, sizeof(*buf), 160, in ); } -int linear_output P1((buf), gsm_signal * buf) +int linear_output P1((buf), gsm_signal * buf) { return -( fwrite( (char *)buf, sizeof(*buf), 160, out ) != 160 ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gsm-1.0-pl14/src/toast_ulaw.c new/gsm-1.0-pl18/src/toast_ulaw.c --- old/gsm-1.0-pl14/src/toast_ulaw.c 2006-04-26 21:14:26.000000000 +0200 +++ new/gsm-1.0-pl18/src/toast_ulaw.c 2018-05-06 04:55:37.000000000 +0200 @@ -37,12 +37,12 @@ 24031, 23002, 21974, 20946, 19918, 18889, 17861, 16833, 16062, 15548, 15033, 14519, 14005, 13491, 12977, 12463, 11949, 11435, 10920, 10406, 9892, 9378, 8864, 8350, - 7964, 7707, 7450, 7193, 6936, 6679, 6422, 6165, - 5908, 5651, 5394, 5137, 4880, 4623, 4365, 4108, - 3916, 3787, 3659, 3530, 3402, 3273, 3144, 3016, - 2887, 2759, 2630, 2502, 2373, 2245, 2116, 1988, - 1891, 1827, 1763, 1698, 1634, 1570, 1506, 1441, - 1377, 1313, 1249, 1184, 1120, 1056, 992, 927, + 7964, 7707, 7450, 7193, 6936, 6679, 6422, 6165, + 5908, 5651, 5394, 5137, 4880, 4623, 4365, 4108, + 3916, 3787, 3659, 3530, 3402, 3273, 3144, 3016, + 2887, 2759, 2630, 2502, 2373, 2245, 2116, 1988, + 1891, 1827, 1763, 1698, 1634, 1570, 1506, 1441, + 1377, 1313, 1249, 1184, 1120, 1056, 992, 927, 879, 847, 815, 783, 751, 718, 686, 654, 622, 590, 558, 526, 494, 461, 429, 397, 373, 357, 341, 325, 309, 293, 277, 261, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gsm-1.0-pl14/tls/bitter.c new/gsm-1.0-pl18/tls/bitter.c --- old/gsm-1.0-pl14/tls/bitter.c 2006-04-26 21:14:25.000000000 +0200 +++ new/gsm-1.0-pl18/tls/bitter.c 2018-05-06 04:55:43.000000000 +0200 @@ -30,7 +30,7 @@ if (vars == bits) { printf( (bits==8? "%s & 0x%lX;\n" : "(%s & 0x%lX);\n"), - sp->var, + sp->var, ~(0xfffffffe << (bits - 1))); if (!-- n_spex) break; sp++; @@ -55,7 +55,7 @@ } else { printf("((%s >> %d) & 0x%X);\n", - sp->var, + sp->var, vars - bits, ~(0xfffffffe << (bits - 1))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gsm-1.0-pl14/tls/ginger.c new/gsm-1.0-pl18/tls/ginger.c --- old/gsm-1.0-pl14/tls/ginger.c 2006-04-26 21:14:25.000000000 +0200 +++ new/gsm-1.0-pl18/tls/ginger.c 2018-05-06 04:55:48.000000000 +0200 @@ -18,7 +18,7 @@ * you of Gary Larson.) */ -#define WORD_BITS 16 /* sizeof(uword) * CHAR_BIT on the +#define WORD_BITS 16 /* sizeof(uword) * CHAR_BIT on the * target architecture---if this isn't 16, * you're in trouble with this library anyway. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gsm-1.0-pl14/tls/sour.c new/gsm-1.0-pl18/tls/sour.c --- old/gsm-1.0-pl14/tls/sour.c 2006-04-26 21:14:25.000000000 +0200 +++ new/gsm-1.0-pl18/tls/sour.c 2018-05-06 04:56:04.000000000 +0200 @@ -40,7 +40,7 @@ * right-hand remainder of a C array.) */ -#define WORD_BITS 16 /* sizeof(uword) * CHAR_BIT on the +#define WORD_BITS 16 /* sizeof(uword) * CHAR_BIT on the * target architecture---if this isn't 16, * you're in trouble with this library anyway. */ @@ -58,9 +58,9 @@ for (; n_spex > 0; n_spex--, sp++) { - /* insert old + /* insert old * new var value unused - * here + * here * * [____________xxxxxx**********] * @@ -68,7 +68,7 @@ */ printf("sr = sr >> %d | %s << %d;\n", sp->varsize, - sp->var, + sp->var, WORD_BITS - sp->varsize); n_in += sp->varsize; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gsm-1.0-pl14/tls/sweet.c new/gsm-1.0-pl18/tls/sweet.c --- old/gsm-1.0-pl14/tls/sweet.c 2006-04-26 21:14:25.000000000 +0200 +++ new/gsm-1.0-pl18/tls/sweet.c 2018-05-06 04:56:09.000000000 +0200 @@ -5,7 +5,7 @@ */ /*$Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/sweet.c,v 1.2 1996/07/02 10:15:53 jutta Exp $*/ - + /* Generate code to unpack a bit array from name:#bits description */ #include <stdio.h> @@ -41,7 +41,7 @@ } else if (vars < bits) { - printf( "(*c >> %d) & 0x%lX;\n", + printf( "(*c >> %d) & 0x%lX;\n", bits - vars, ~(0xfffffffe << (vars - 1))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gsm-1.0-pl14/tls/taste.h new/gsm-1.0-pl18/tls/taste.h --- old/gsm-1.0-pl14/tls/taste.h 2006-04-26 21:14:25.000000000 +0200 +++ new/gsm-1.0-pl18/tls/taste.h 2018-05-06 04:56:37.000000000 +0200 @@ -3,7 +3,7 @@ * Universitaet Berlin. See the accompanying file "COPYRIGHT" for * details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE. */ - + /* * common code to sweet.c and bitter.c */ ++++++ libgsm-1.0.13.patch ++++++ --- /var/tmp/diff_new_pack.nX5cPt/_old 2019-02-27 15:04:55.758468814 +0100 +++ /var/tmp/diff_new_pack.nX5cPt/_new 2019-02-27 15:04:55.782468807 +0100 @@ -1,6 +1,9 @@ ---- gsm-1.0-pl12/Makefile -+++ gsm-1.0-pl12/Makefile -@@ -96,7 +96,7 @@ +From: <[email protected]> +Subject: New patch generated from libgsm 1.0.10-14 diff.gz + +--- a/Makefile ++++ b/Makefile +@@ -96,7 +96,7 @@ TOAST_INSTALL_MAN = $(TOAST_INSTALL_ROOT # Other tools SHELL = /bin/sh @@ -9,7 +12,7 @@ BASENAME = basename AR = ar ARFLAGS = cr -@@ -140,6 +140,7 @@ +@@ -140,6 +140,7 @@ LFLAGS = $(LDFLAGS) $(LDINC) # Targets LIBGSM = $(LIB)/libgsm.a @@ -17,7 +20,7 @@ TOAST = $(BIN)/toast UNTOAST = $(BIN)/untoast -@@ -279,7 +280,7 @@ +@@ -279,7 +280,7 @@ TOAST_INSTALL_TARGETS = \ # Target rules @@ -26,19 +29,19 @@ @-echo $(ROOT): Done. tst: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result -@@ -299,6 +300,11 @@ +@@ -299,6 +300,11 @@ install: toastinstall gsminstall # The basic API: libgsm +$(LIBGSMSO): $(LIB) $(GSM_OBJECTS) -+ $(LD) -o [email protected] -shared -Xlinker -soname -Xlinker libgsm.so.1 $(GSM_OBJECTS) -lc -+ ln -fs libgsm.so.1.0.13 lib/libgsm.so.1 -+ ln -fs libgsm.so.1.0.13 lib/libgsm.so ++ $(LD) $(LDFLAGS) -o [email protected] -shared -Xlinker -soname -Xlinker libgsm.so.1 $(GSM_OBJECTS) -lc ++ ln -fs libgsm.so.1.0.18 lib/libgsm.so.1 ++ ln -fs libgsm.so.1.0.18 lib/libgsm.so + $(LIBGSM): $(LIB) $(GSM_OBJECTS) -rm $(RMFLAGS) $(LIBGSM) $(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS) -@@ -308,15 +314,15 @@ +@@ -308,15 +314,15 @@ $(LIBGSM): $(LIB) $(GSM_OBJECTS) # Toast, Untoast and Tcat -- the compress-like frontends to gsm. $(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSM) @@ -57,181 +60,14 @@ # The local bin and lib directories -@@ -426,7 +432,9 @@ +@@ -426,7 +432,9 @@ semi-clean: clean: semi-clean -rm $(RMFLAGS) $(LIBGSM) $(ADDTST)/add \ - $(TOAST) $(TCAT) $(UNTOAST) \ -+ $(LIBGSMSO) $(LIB)/libgsm.so.1.0.13 \ ++ $(LIBGSMSO) $(LIB)/libgsm.so.1.0.18 \ + $(LIB)libgsm.so.1 \ + $(TOAST) $(TCAT) $(UNTOAST) \ $(ROOT)/gsm-1.0.tar.Z ---- gsm-1.0-pl12/inc/config.h -+++ gsm-1.0-pl12/inc/config.h -@@ -13,6 +13,7 @@ - /*efine HAS_SYSV_SIGNAL 1 /* sigs not blocked/reset? */ - - #define HAS_STDLIB_H 1 /* /usr/include/stdlib.h */ -+#define HAS_STDIO_H 1 /* /usr/include/stdio.h */ - #define HAS_LIMITS_H 1 /* /usr/include/limits.h */ - #define HAS_FCNTL_H 1 /* /usr/include/fcntl.h */ - #define HAS_ERRNO_DECL 1 /* errno.h declares errno */ -@@ -25,7 +26,7 @@ - /*efine HAS__FSETMODE 1 /* _fsetmode -- set file mode */ - - #define HAS_STRING_H 1 /* /usr/include/string.h */ --/*efine HAS_STRINGS_H 1 /* /usr/include/strings.h */ -+#define HAS_STRINGS_H 1 /* /usr/include/strings.h */ - - #define HAS_UNISTD_H 1 /* /usr/include/unistd.h */ - #define HAS_UTIME 1 /* POSIX utime(path, times) */ ---- gsm-1.0-pl12/inc/gsm.h -+++ gsm-1.0-pl12/inc/gsm.h -@@ -54,6 +54,10 @@ - #define GSM_OPT_FRAME_INDEX 5 - #define GSM_OPT_FRAME_CHAIN 6 - -+#ifdef __cplusplus -+extern "C" { -+#endif -+ - extern gsm gsm_create GSM_P((void)); - extern void gsm_destroy GSM_P((gsm)); - -@@ -66,6 +70,10 @@ - extern int gsm_explode GSM_P((gsm, gsm_byte *, gsm_signal *)); - extern void gsm_implode GSM_P((gsm, gsm_signal *, gsm_byte *)); - -+#ifdef __cplusplus -+} -+#endif -+ - #undef GSM_P - - #endif /* GSM_H */ ---- gsm-1.0-pl12/inc/toast.h -+++ gsm-1.0-pl12/inc/toast.h -@@ -16,11 +16,12 @@ - - #include <stdio.h> - #include <ctype.h> -+#include <pthread.h> - #include <signal.h> - - #include <errno.h> --#ifndef HAS_ERRNO_DECL -- extern int errno; -+#ifndef errno -+ extern int errno; - #endif - - #ifdef HAS_LIMITS_H -@@ -37,6 +38,10 @@ - # endif - #endif - -+#ifdef HAS_STDIO_H -+# include <stdio.h> -+#endif -+ - #include "gsm.h" - - #ifndef S_ISREG ---- gsm-1.0-pl12/src/debug.c -+++ gsm-1.0-pl12/src/debug.c -@@ -49,7 +49,7 @@ - fprintf( stderr, "%s [%d .. %d]: ", name, from, to ); - while (from <= to) { - -- fprintf(stderr, "%d ", ptr[ from ] ); -+ fprintf(stderr, "%ld ", ptr[ from ] ); - from++; - if (nprinted++ >= 7) { - nprinted = 0; -@@ -63,14 +63,14 @@ - char * name, - longword value ) - { -- fprintf(stderr, "%s: %d\n", name, (long)value ); -+ fprintf(stderr, "%s: %ld\n", name, (long)value ); - } - - void gsm_debug_word P2( (name, value), - char * name, - word value ) - { -- fprintf(stderr, "%s: %d\n", name, (long)value); -+ fprintf(stderr, "%s: %ld\n", name, (long)value); - } - - #endif ---- gsm-1.0-pl12/src/toast.c -+++ gsm-1.0-pl12/src/toast.c -@@ -251,8 +251,8 @@ - { - char * s; - if (!(s = malloc(len))) { -- fprintf(stderr, "%s: failed to malloc %d bytes -- abort\n", -- progname, len); -+ fprintf(stderr, "%s: failed to malloc %ld bytes -- abort\n", -+ progname, (long) len); - onintr(); - exit(1); - } -@@ -270,7 +270,7 @@ - maxlen = strlen(name) + 1 + strlen(want) + strlen(cut); - p = strcpy(emalloc(maxlen), name); - -- if (s = suffix(p, cut)) strcpy(s, want); -+ if ((s = suffix(p, cut))) strcpy(s, want); - else if (*want && !suffix(p, want)) strcat(p, want); - - return p; -@@ -386,7 +386,7 @@ - ut[0] = instat.st_atime; - ut[1] = instat.st_mtime; - -- (void) utime(outname, ut); -+ (void) utime(outname, (struct utimbuf *)ut); - - #endif /* UTIMBUF */ - } -@@ -416,7 +416,7 @@ - } - if (st->st_nlink > 1 && !f_cat && !f_precious) { - fprintf(stderr, -- "%s: \"%s\" has %s other link%s -- unchanged.\n", -+ "%s: \"%s\" has %d other link%s -- unchanged.\n", - progname,name,st->st_nlink - 1,"s" + (st->st_nlink<=2)); - return 0; - } -@@ -585,8 +585,8 @@ - - if (cc != sizeof(s)) { - if (cc >= 0) fprintf(stderr, -- "%s: incomplete frame (%d byte%s missing) from %s\n", -- progname, sizeof(s) - cc, -+ "%s: incomplete frame (%ld byte%s missing) from %s\n", -+ progname, (long) sizeof(s) - cc, - "s" + (sizeof(s) - cc == 1), - inname ? inname : "stdin" ); - gsm_destroy(r); -@@ -624,8 +624,6 @@ - - static int process P1((name), char * name) - { -- int step = 0; -- - out = (FILE *)0; - in = (FILE *)0; - -@@ -779,7 +777,6 @@ - case 'h': help(); exit(0); - - default: -- usage: - fprintf(stderr, - "Usage: %s [-fcpdhvuaslFC] [files...] (-h for help)\n", - progname);
