[libdvdcss-devel] whitespace cleanup

Discussion:

Diego Biurrun

2014-10-20 17:10:20 UTC

http://git.videolan.org/gitweb.cgi/libdvdcss.git/?a=commit;h=f6c90e609d524266f5fdaf550b5aa263b0143103

---

COPYING | 14 +++++++-------
configure.ac | 4 ++--
libdvdcss.spec | 38 +++++++++++++++++++-------------------
m4/attributes.m4 | 6 +++---
test/dvd_region.c | 22 +++++++++++-----------
5 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/COPYING b/COPYING
index d60c31a..a3e9774 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,12 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991

Copyright (C) 1989, 1991 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.

- Preamble
+ Preamble

The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
@@ -56,7 +56,7 @@ patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.

- GNU GENERAL PUBLIC LICENSE
+ GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

0. This License applies to any program or other work which contains
@@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.

- NO WARRANTY
+ NO WARRANTY

11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.

- END OF TERMS AND CONDITIONS
+ END OF TERMS AND CONDITIONS

- How to Apply These Terms to Your New Programs
+ How to Apply These Terms to Your New Programs

If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
diff --git a/configure.ac b/configure.ac
index 129f20b..e434298 100644
--- a/configure.ac
+++ b/configure.ac
@@ -189,7 +189,7 @@ AC_CHECK_HEADERS(sys/ioctl.h,[
])
])
dnl
- dnl Darwin
+ dnl Darwin
dnl
AC_CHECK_HEADER(IOKit/storage/IODVDMediaBSDClient.h,[
AC_DEFINE(DARWIN_DVD_IOCTL, 1, Have IOKit DVD IOCTL headers)
@@ -199,7 +199,7 @@ AC_CHECK_HEADERS(sys/ioctl.h,[
dnl Final tests to check what was detected
dnl
if test x$LINUX_DVD_STRUCT = x1; then
- AC_DEFINE(HAVE_LINUX_DVD_STRUCT, 1,
+ AC_DEFINE(HAVE_LINUX_DVD_STRUCT, 1,
Define if Linux-like dvd_struct is defined.)
if test x$OPENBSD_DVD_STRUCT = x1; then
AC_DEFINE(HAVE_OPENBSD_DVD_STRUCT, 1,
diff --git a/libdvdcss.spec b/libdvdcss.spec
index 0567388..6cef084 100644
--- a/libdvdcss.spec
+++ b/libdvdcss.spec
@@ -1,8 +1,8 @@
-%define name libdvdcss
-%define version 1.2.9
-%define release 1
+%define name libdvdcss
+%define version 1.2.9
+%define release 1

-%define major 2
+%define major 2
%define libname %{name}%{major}

%define buildfor_rh9 %([[ -e /etc/mandrake-release ]] && echo 0 || echo 1)
@@ -16,17 +16,17 @@
%endif

-Name: %{name}
-Version: %{version}
-Release: %{release}
+Name: %{name}
+Version: %{version}
+Release: %{release}
Summary: Library for accessing DVDs like block devices with transparent decryption
-Source: %{name}-%{version}.tar.bz2
-License: GPL
-Group: System/Libraries
-URL: http://www.videolan.org/libdvdcss/
-Packager: Yves Duret <***@zarb.org>
-BuildRoot: %_tmppath/%name-%version-%release-root
-Conflicts: libdvdcss0.0.1, libdvdcss0.0.2
+Source: %{name}-%{version}.tar.bz2
+License: GPL
+Group: System/Libraries
+URL: http://www.videolan.org/libdvdcss/
+Packager: Yves Duret <***@zarb.org>
+BuildRoot: %_tmppath/%name-%version-%release-root
+Conflicts: libdvdcss0.0.1, libdvdcss0.0.2

%description
libdvdcss is a simple library designed for accessing DVDs like a block device
@@ -60,14 +60,14 @@ without having to bother about the decryption. The important features are:
%package -n %{libname}-devel
Summary: Development tools for programs which will use the %{name} library
Group: Development/C
-Requires: %{libname} = %version-%release
+Requires: %{libname} = %version-%release
Provides: %{name}-devel = %version-%release
-
+
%description -n %{libname}-devel
The %{name}-devel package includes the header files and static libraries
necessary for developing programs which will manipulate DVDs files using
the %{name} library.
-
+
If you are going to develop programs which will manipulate DVDs, you
should install %{name}-devel. You'll also need to have the %{name}
package installed.
@@ -86,7 +86,7 @@ package installed.
[ %buildroot != "/" ] && rm -Rf %buildroot

%post -n %{libname} -p /sbin/ldconfig
-
+
%postun -n %{libname} -p /sbin/ldconfig

%files -n %{libname}
@@ -156,7 +156,7 @@ package installed.
* Sat Apr 06 2002 Guillaume Rousse <***@ccr.jussieu.fr> 1.1.1-1plf
- 1.1.1

-* Wed Jan 30 2002 Guillaume Rousse <***@ccr.jussieu.fr> 1.0.0-3plf
+* Wed Jan 30 2002 Guillaume Rousse <***@ccr.jussieu.fr> 1.0.0-3plf
- new plf extension

* Wed Dec 05 2001 Guillaume Rousse <***@linux-mandrake.com> 1.0.0-3mdk
diff --git a/m4/attributes.m4 b/m4/attributes.m4
index b8b3350..39d02e3 100644
--- a/m4/attributes.m4
+++ b/m4/attributes.m4
@@ -239,8 +239,8 @@ AC_DEFUN([CC_FLAG_VISIBILITY], [
[cc_flag_visibility_save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $cc_cv_werror"
CC_CHECK_CFLAGS_SILENT([-fvisibility=hidden],
- cc_cv_flag_visibility='yes',
- cc_cv_flag_visibility='no')
+ cc_cv_flag_visibility='yes',
+ cc_cv_flag_visibility='no')
CFLAGS="$cc_flag_visibility_save_CFLAGS"])

AS_IF([test "x$cc_cv_flag_visibility" = "xyes"],
@@ -260,7 +260,7 @@ AC_DEFUN([CC_FUNC_EXPECT], [
[int some_function() {
int a = 3;
return (int)__builtin_expect(a, 3);
- }],
+ }],
[cc_cv_func_expect=yes],
[cc_cv_func_expect=no])
CFLAGS="$ac_save_CFLAGS"
diff --git a/test/dvd_region.c b/test/dvd_region.c
index 47abea8..53798b4 100644
--- a/test/dvd_region.c
+++ b/test/dvd_region.c
@@ -176,7 +176,7 @@ static int print_region(int fd)
int type, region_mask, rpc_scheme;
int region = 1;
int ret;
-
+
printf("Drive region info:\n");

if( (ret = ioctl_ReportRPC(fd, &type, &region_mask, &rpc_scheme)) < 0) {
@@ -194,11 +194,11 @@ static int print_region(int fd)
break;
case 2:
printf("Drive region is set, with additional " \
- "restrictions required to make a change\n");
+ "restrictions required to make a change\n");
break;
case 3:
printf("Drive region has been set permanently, but " \
- "may be reset by the vendor if necessary\n");
+ "may be reset by the vendor if necessary\n");
break;
default:
printf("Invalid( %x)\n", type);
@@ -211,7 +211,7 @@ static int print_region(int fd)
if( region_mask)
while(region_mask) {
if( !(region_mask & 1) )
- printf("%d playable\n", region);
+ printf("%d playable\n", region);
region++;
region_mask >>= 1;
}
@@ -222,12 +222,12 @@ static int print_region(int fd)
switch( rpc_scheme ) {
case 0:
printf("The Logical Unit does not enforce Region " \
- "Playback Controls( RPC)\n");
+ "Playback Controls( RPC)\n");
break;
case 1:
printf("The Logical Unit _shall_ adhere to the "
- "specification and all requirements of the " \
- "CSS license agreement concerning RPC\n");
+ "specification and all requirements of the " \
+ "CSS license agreement concerning RPC\n");
break;
default:
printf("Reserved( %x)\n", rpc_scheme);
@@ -238,9 +238,9 @@ static int print_region(int fd)

static void usage(void)
{
- fprintf( stderr,
- "Usage: dvd_region [ -d device ] [ [ -s ] [ -r region ] ]\n" );
-}
+ fprintf( stderr,
+ "Usage: dvd_region [ -d device ] [ [ -s ] [ -r region ] ]\n" );
+}

int main(int argc, char *argv[])
{
@@ -298,7 +298,7 @@ int main(int argc, char *argv[])
fprintf( stderr, "you must specify the region!\n" );
exit(0);
}
-
+
if( (ret = set_region(fd, region)) < 0 )
return ret;
}

Diego Biurrun

2014-10-20 17:14:55 UTC

Permalink

http://git.videolan.org/gitweb.cgi/libdvdcss.git/?a=commit;h=f7b08a3494ebc429ad81676cd26a57ce5acb67cf

Diego Biurrun

2014-10-21 19:17:05 UTC

Permalink

http://git.videolan.org/gitweb.cgi/libdvdcss.git/?a=commit;h=51efb34db97378a51f5de458a0b27136630176e0

---

COPYING | 14 +++++++-------
NEWS | 1 -
README | 1 -
configure.ac | 4 ++--
libdvdcss.spec | 38 +++++++++++++++++++-------------------
m4/attributes.m4 | 6 +++---
src/device.c | 1 -
src/error.c | 1 -
src/libdvdcss.c | 1 -
test/csstest.c | 1 -
test/dvd_region.c | 22 +++++++++++-----------
11 files changed, 42 insertions(+), 48 deletions(-)

diff --git a/COPYING b/COPYING
index d60c31a..a3e9774 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,12 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991

Copyright (C) 1989, 1991 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.

- Preamble
+ Preamble

The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
@@ -56,7 +56,7 @@ patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.

- GNU GENERAL PUBLIC LICENSE
+ GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

0. This License applies to any program or other work which contains
@@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.

- NO WARRANTY
+ NO WARRANTY

11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.

- END OF TERMS AND CONDITIONS
+ END OF TERMS AND CONDITIONS

- How to Apply These Terms to Your New Programs
+ How to Apply These Terms to Your New Programs

If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
diff --git a/NEWS b/NEWS
index 21c0d33..64dd8f9 100644
--- a/NEWS
+++ b/NEWS
@@ -146,4 +146,3 @@ Changes between 0.0.1 and 0.0.2:

* internal key cache mechanism
* stability fixes
-
diff --git a/README b/README
index c450b88..a7b17d7 100644
--- a/README
+++ b/README
@@ -59,4 +59,3 @@ Resources
The VideoLAN web site at http://www.videolan.org/ is a good start for
information about MPEG and DVD playback. Have a look at the support
section to look for answers.
-
diff --git a/configure.ac b/configure.ac
index 129f20b..e434298 100644
--- a/configure.ac
+++ b/configure.ac
@@ -189,7 +189,7 @@ AC_CHECK_HEADERS(sys/ioctl.h,[
])
])
dnl
- dnl Darwin
+ dnl Darwin
dnl
AC_CHECK_HEADER(IOKit/storage/IODVDMediaBSDClient.h,[
AC_DEFINE(DARWIN_DVD_IOCTL, 1, Have IOKit DVD IOCTL headers)
@@ -199,7 +199,7 @@ AC_CHECK_HEADERS(sys/ioctl.h,[
dnl Final tests to check what was detected
dnl
if test x$LINUX_DVD_STRUCT = x1; then
- AC_DEFINE(HAVE_LINUX_DVD_STRUCT, 1,
+ AC_DEFINE(HAVE_LINUX_DVD_STRUCT, 1,
Define if Linux-like dvd_struct is defined.)
if test x$OPENBSD_DVD_STRUCT = x1; then
AC_DEFINE(HAVE_OPENBSD_DVD_STRUCT, 1,
diff --git a/libdvdcss.spec b/libdvdcss.spec
index 0567388..6cef084 100644
--- a/libdvdcss.spec
+++ b/libdvdcss.spec
@@ -1,8 +1,8 @@
-%define name libdvdcss
-%define version 1.2.9
-%define release 1
+%define name libdvdcss
+%define version 1.2.9
+%define release 1

-%define major 2
+%define major 2
%define libname %{name}%{major}

%define buildfor_rh9 %([[ -e /etc/mandrake-release ]] && echo 0 || echo 1)
@@ -16,17 +16,17 @@
%endif

-Name: %{name}
-Version: %{version}
-Release: %{release}
+Name: %{name}
+Version: %{version}
+Release: %{release}
Summary: Library for accessing DVDs like block devices with transparent decryption
-Source: %{name}-%{version}.tar.bz2
-License: GPL
-Group: System/Libraries
-URL: http://www.videolan.org/libdvdcss/
-Packager: Yves Duret <***@zarb.org>
-BuildRoot: %_tmppath/%name-%version-%release-root
-Conflicts: libdvdcss0.0.1, libdvdcss0.0.2
+Source: %{name}-%{version}.tar.bz2
+License: GPL
+Group: System/Libraries
+URL: http://www.videolan.org/libdvdcss/
+Packager: Yves Duret <***@zarb.org>
+BuildRoot: %_tmppath/%name-%version-%release-root
+Conflicts: libdvdcss0.0.1, libdvdcss0.0.2

%description
libdvdcss is a simple library designed for accessing DVDs like a block device
@@ -60,14 +60,14 @@ without having to bother about the decryption. The important features are:
%package -n %{libname}-devel
Summary: Development tools for programs which will use the %{name} library
Group: Development/C
-Requires: %{libname} = %version-%release
+Requires: %{libname} = %version-%release
Provides: %{name}-devel = %version-%release
-
+
%description -n %{libname}-devel
The %{name}-devel package includes the header files and static libraries
necessary for developing programs which will manipulate DVDs files using
the %{name} library.
-
+
If you are going to develop programs which will manipulate DVDs, you
should install %{name}-devel. You'll also need to have the %{name}
package installed.
@@ -86,7 +86,7 @@ package installed.
[ %buildroot != "/" ] && rm -Rf %buildroot

%post -n %{libname} -p /sbin/ldconfig
-
+
%postun -n %{libname} -p /sbin/ldconfig

%files -n %{libname}
@@ -156,7 +156,7 @@ package installed.
* Sat Apr 06 2002 Guillaume Rousse <***@ccr.jussieu.fr> 1.1.1-1plf
- 1.1.1

-* Wed Jan 30 2002 Guillaume Rousse <***@ccr.jussieu.fr> 1.0.0-3plf
+* Wed Jan 30 2002 Guillaume Rousse <***@ccr.jussieu.fr> 1.0.0-3plf
- new plf extension

* Wed Dec 05 2001 Guillaume Rousse <***@linux-mandrake.com> 1.0.0-3mdk
diff --git a/m4/attributes.m4 b/m4/attributes.m4
index b8b3350..39d02e3 100644
--- a/m4/attributes.m4
+++ b/m4/attributes.m4
@@ -239,8 +239,8 @@ AC_DEFUN([CC_FLAG_VISIBILITY], [
[cc_flag_visibility_save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $cc_cv_werror"
CC_CHECK_CFLAGS_SILENT([-fvisibility=hidden],
- cc_cv_flag_visibility='yes',
- cc_cv_flag_visibility='no')
+ cc_cv_flag_visibility='yes',
+ cc_cv_flag_visibility='no')
CFLAGS="$cc_flag_visibility_save_CFLAGS"])

AS_IF([test "x$cc_cv_flag_visibility" = "xyes"],
@@ -260,7 +260,7 @@ AC_DEFUN([CC_FUNC_EXPECT], [
[int some_function() {
int a = 3;
return (int)__builtin_expect(a, 3);
- }],
+ }],
[cc_cv_func_expect=yes],
[cc_cv_func_expect=no])
CFLAGS="$ac_save_CFLAGS"
diff --git a/src/device.c b/src/device.c
index f78ffc0..2f4ae1d 100644
--- a/src/device.c
+++ b/src/device.c
@@ -1072,4 +1072,3 @@ static int aspi_read_internal( int i_fd, void *p_data, int i_blocks )
return i_blocks;
}
#endif
-
diff --git a/src/error.c b/src/error.c
index e7127b6..7655574 100644
--- a/src/error.c
+++ b/src/error.c
@@ -64,4 +64,3 @@ void _print_debug( dvdcss_t dvdcss, char *psz_string )
}
}
#endif
-
diff --git a/src/libdvdcss.c b/src/libdvdcss.c
index 6c4befc..4175b89 100644
--- a/src/libdvdcss.c
+++ b/src/libdvdcss.c
@@ -777,4 +777,3 @@ LIBDVDCSS_EXPORT int dvdcss_is_scrambled ( dvdcss_t dvdcss )
{
return dvdcss->b_scrambled;
}
-
diff --git a/test/csstest.c b/test/csstest.c
index 16300a0..d09565a 100644
--- a/test/csstest.c
+++ b/test/csstest.c
@@ -124,4 +124,3 @@ static void dumpsector( unsigned char *p_buffer )
for( ; i_amount ; i_amount--, p_buffer++ ) printf( "%.2x", *p_buffer );
printf( "...\n" );
}
-
diff --git a/test/dvd_region.c b/test/dvd_region.c
index 47abea8..53798b4 100644
--- a/test/dvd_region.c
+++ b/test/dvd_region.c
@@ -176,7 +176,7 @@ static int print_region(int fd)
int type, region_mask, rpc_scheme;
int region = 1;
int ret;
-
+
printf("Drive region info:\n");

if( (ret = ioctl_ReportRPC(fd, &type, &region_mask, &rpc_scheme)) < 0) {
@@ -194,11 +194,11 @@ static int print_region(int fd)
break;
case 2:
printf("Drive region is set, with additional " \
- "restrictions required to make a change\n");
+ "restrictions required to make a change\n");
break;
case 3:
printf("Drive region has been set permanently, but " \
- "may be reset by the vendor if necessary\n");
+ "may be reset by the vendor if necessary\n");
break;
default:
printf("Invalid( %x)\n", type);
@@ -211,7 +211,7 @@ static int print_region(int fd)
if( region_mask)
while(region_mask) {
if( !(region_mask & 1) )
- printf("%d playable\n", region);
+ printf("%d playable\n", region);
region++;
region_mask >>= 1;
}
@@ -222,12 +222,12 @@ static int print_region(int fd)
switch( rpc_scheme ) {
case 0:
printf("The Logical Unit does not enforce Region " \
- "Playback Controls( RPC)\n");
+ "Playback Controls( RPC)\n");
break;
case 1:
printf("The Logical Unit _shall_ adhere to the "
- "specification and all requirements of the " \
- "CSS license agreement concerning RPC\n");
+ "specification and all requirements of the " \
+ "CSS license agreement concerning RPC\n");
break;
default:
printf("Reserved( %x)\n", rpc_scheme);
@@ -238,9 +238,9 @@ static int print_region(int fd)

static void usage(void)
{
- fprintf( stderr,
- "Usage: dvd_region [ -d device ] [ [ -s ] [ -r region ] ]\n" );
-}
+ fprintf( stderr,
+ "Usage: dvd_region [ -d device ] [ [ -s ] [ -r region ] ]\n" );
+}

int main(int argc, char *argv[])
{
@@ -298,7 +298,7 @@ int main(int argc, char *argv[])
fprintf( stderr, "you must specify the region!\n" );
exit(0);
}
-
+
if( (ret = set_region(fd, region)) < 0 )
return ret;
}