From ce3f61ef58523a6e0f8f931a6ef454ca1c0f4870 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 24 Jan 2012 17:03:14 -0200 Subject: [PATCH] Add the missing license comments to the files While everything is GPLv2 only, the license were missed on some files. Properly fill them. Signed-off-by: Mauro Carvalho Chehab --- utils/dvb/descriptors.c | 18 ++++++++++++++++++ utils/dvb/descriptors.h | 19 +++++++++++++++++++ utils/dvb/dvb-demux.c | 29 ++++++++++++++++++----------- utils/dvb/dvb-demux.h | 28 ++++++++++++++++++---------- utils/dvb/dvb-fe-tool.c | 18 +++++++++++++++++- utils/dvb/dvb-fe.c | 17 ++++++++++++++++- utils/dvb/dvb-fe.h | 18 +++++++++++++++++- utils/dvb/dvb-file.c | 3 ++- utils/dvb/dvb-file.h | 4 +++- utils/dvb/dvb-legacy-channel-format.c | 2 +- utils/dvb/dvb-v5-std.h | 17 +++++++++++++++++ utils/dvb/dvb-zap-format.c | 3 ++- utils/dvb/dvbv5-scan.c | 2 +- utils/dvb/dvbv5-zap.c | 2 +- utils/dvb/libsat.c | 20 ++++++++++++++++++++ utils/dvb/libsat.h | 19 +++++++++++++++++++ utils/dvb/libscan.c | 19 +++++++++++++++++++ utils/dvb/libscan.h | 19 +++++++++++++++++++ utils/dvb/parse_string.c | 19 +++++++++++++++++++ utils/dvb/parse_string.h | 19 +++++++++++++++++++ 20 files changed, 265 insertions(+), 30 deletions(-) diff --git a/utils/dvb/descriptors.c b/utils/dvb/descriptors.c index 954be15..944c8a7 100644 --- a/utils/dvb/descriptors.c +++ b/utils/dvb/descriptors.c @@ -1,3 +1,21 @@ +/* + * Copyright (c) 2011-2012 - Mauro Carvalho Chehab + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation version 2 + * of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Or, point your browser to http://www.gnu.org/licenses/old-licenses/gpl-2.0.html + */ #include #include diff --git a/utils/dvb/descriptors.h b/utils/dvb/descriptors.h index 3208d0f..0b7f787 100644 --- a/utils/dvb/descriptors.h +++ b/utils/dvb/descriptors.h @@ -1,4 +1,23 @@ /* + * Copyright (c) 2011-2012 - Mauro Carvalho Chehab + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation version 2 + * of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Or, point your browser to http://www.gnu.org/licenses/old-licenses/gpl-2.0.html + */ + +/* * Descriptors, as defined on ETSI EN 300 468 V1.11.1 (2010-04) */ diff --git a/utils/dvb/dvb-demux.c b/utils/dvb/dvb-demux.c index aaeb416..6ff9d20 100644 --- a/utils/dvb/dvb-demux.c +++ b/utils/dvb/dvb-demux.c @@ -1,13 +1,8 @@ /* - * util functions for various ?zap implementations - * - * Copyright (C) 2001 Johannes Stezenbach (js@convergence.de) - * for convergence integrated media - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation version 2 + * of the License. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -16,7 +11,20 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Or, point your browser to http://www.gnu.org/licenses/old-licenses/gpl-2.0.html + * + * These routines were written as part of the dvb-apps, as: + * util functions for various ?zap implementations + * + * Copyright (C) 2001 Johannes Stezenbach (js@convergence.de) + * for convergence integrated media + * + * Originally licensed as GPLv2 or upper + * + * All subsequent changes are under GPLv2 only and are: + * Copyright (c) 2011-2012 - Mauro Carvalho Chehab + * */ #include @@ -63,7 +71,6 @@ int set_pesfilter(int dmxfd, int pid, int pes_type, int dvr) return 0; } - int get_pmt_pid(char *dmxdev, int sid) { int patfd, count; diff --git a/utils/dvb/dvb-demux.h b/utils/dvb/dvb-demux.h index f4b7f12..80295e8 100644 --- a/utils/dvb/dvb-demux.h +++ b/utils/dvb/dvb-demux.h @@ -1,13 +1,8 @@ /* - * util functions for various ?zap implementations - * - * Copyright (C) 2001 Johannes Stezenbach (js@convergence.de) - * for convergence integrated media - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation version 2 + * of the License. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -16,7 +11,20 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Or, point your browser to http://www.gnu.org/licenses/old-licenses/gpl-2.0.html + * + * These routines were written as part of the dvb-apps, as: + * util functions for various ?zap implementations + * + * Copyright (C) 2001 Johannes Stezenbach (js@convergence.de) + * for convergence integrated media + * + * Originally licensed as GPLv2 or upper + * + * All subsequent changes are under GPLv2 only and are: + * Copyright (c) 2011-2012 - Mauro Carvalho Chehab + * */ int set_pesfilter(int dmxfd, int pid, int pes_type, int dvr); diff --git a/utils/dvb/dvb-fe-tool.c b/utils/dvb/dvb-fe-tool.c index 747f3cf..6c633b7 100644 --- a/utils/dvb/dvb-fe-tool.c +++ b/utils/dvb/dvb-fe-tool.c @@ -1,5 +1,21 @@ /* - * Copyright (c) 2011 - Mauro Carvalho Chehab + * Copyright (c) 2011-2012 - Mauro Carvalho Chehab + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation version 2 + * of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Or, point your browser to http://www.gnu.org/licenses/old-licenses/gpl-2.0.html + * */ #include "dvb-fe.h" diff --git a/utils/dvb/dvb-fe.c b/utils/dvb/dvb-fe.c index 975757e..663caa6 100644 --- a/utils/dvb/dvb-fe.c +++ b/utils/dvb/dvb-fe.c @@ -1,5 +1,20 @@ /* - * Copyright (c) 2011 - Mauro Carvalho Chehab + * Copyright (c) 2011-2012 - Mauro Carvalho Chehab + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation version 2 + * of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Or, point your browser to http://www.gnu.org/licenses/old-licenses/gpl-2.0.html */ #include "dvb-v5.h" diff --git a/utils/dvb/dvb-fe.h b/utils/dvb/dvb-fe.h index ac117b6..a453424 100644 --- a/utils/dvb/dvb-fe.h +++ b/utils/dvb/dvb-fe.h @@ -1,5 +1,21 @@ /* - * Copyright (c) 2011 - Mauro Carvalho Chehab + * Copyright (c) 2011-2012 - Mauro Carvalho Chehab + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation version 2 + * of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Or, point your browser to http://www.gnu.org/licenses/old-licenses/gpl-2.0.html + * */ #include diff --git a/utils/dvb/dvb-file.c b/utils/dvb/dvb-file.c index 32ba56f..a05316a 100644 --- a/utils/dvb/dvb-file.c +++ b/utils/dvb/dvb-file.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 - Mauro Carvalho Chehab + * Copyright (c) 2011-2012 - Mauro Carvalho Chehab * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -15,6 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Or, point your browser to http://www.gnu.org/licenses/old-licenses/gpl-2.0.html + * */ #include diff --git a/utils/dvb/dvb-file.h b/utils/dvb/dvb-file.h index 9fa5e54..7e0803e 100644 --- a/utils/dvb/dvb-file.h +++ b/utils/dvb/dvb-file.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 - Mauro Carvalho Chehab + * Copyright (c) 2011-2012 - Mauro Carvalho Chehab * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -15,8 +15,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Or, point your browser to http://www.gnu.org/licenses/old-licenses/gpl-2.0.html + * */ + #include "dvb-fe.h" struct dvb_entry { diff --git a/utils/dvb/dvb-legacy-channel-format.c b/utils/dvb/dvb-legacy-channel-format.c index 61ba495..53f821b 100644 --- a/utils/dvb/dvb-legacy-channel-format.c +++ b/utils/dvb/dvb-legacy-channel-format.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 - Mauro Carvalho Chehab + * Copyright (c) 2011-2012 - Mauro Carvalho Chehab * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/utils/dvb/dvb-v5-std.h b/utils/dvb/dvb-v5-std.h index 7f20738..6403ad2 100644 --- a/utils/dvb/dvb-v5-std.h +++ b/utils/dvb/dvb-v5-std.h @@ -1,4 +1,21 @@ /* + * Copyright (c) 2011-2012 - Mauro Carvalho Chehab + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation version 2 + * of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Or, point your browser to http://www.gnu.org/licenses/old-licenses/gpl-2.0.html + * * Per-delivery system properties, according with the specs: * http://linuxtv.org/downloads/v4l-dvb-apis/FE_GET_SET_PROPERTY.html */ diff --git a/utils/dvb/dvb-zap-format.c b/utils/dvb/dvb-zap-format.c index 53a2eb3..876395a 100644 --- a/utils/dvb/dvb-zap-format.c +++ b/utils/dvb/dvb-zap-format.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 - Mauro Carvalho Chehab + * Copyright (c) 2011-2012 - Mauro Carvalho Chehab * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -15,6 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Or, point your browser to http://www.gnu.org/licenses/old-licenses/gpl-2.0.html + * */ #include diff --git a/utils/dvb/dvbv5-scan.c b/utils/dvb/dvbv5-scan.c index ea86cf9..0d424c3 100644 --- a/utils/dvb/dvbv5-scan.c +++ b/utils/dvb/dvbv5-scan.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 - Mauro Carvalho Chehab + * Copyright (c) 2011-2012 - Mauro Carvalho Chehab * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/utils/dvb/dvbv5-zap.c b/utils/dvb/dvbv5-zap.c index 7e4bc6b..0ad5378 100644 --- a/utils/dvb/dvbv5-zap.c +++ b/utils/dvb/dvbv5-zap.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 - Mauro Carvalho Chehab + * Copyright (c) 2011-2012 - Mauro Carvalho Chehab * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/utils/dvb/libsat.c b/utils/dvb/libsat.c index 0870b1a..d155686 100644 --- a/utils/dvb/libsat.c +++ b/utils/dvb/libsat.c @@ -1,3 +1,23 @@ +/* + * Copyright (c) 2011-2012 - Mauro Carvalho Chehab + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation version 2 + * of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Or, point your browser to http://www.gnu.org/licenses/old-licenses/gpl-2.0.html + * + */ + #include #include #include diff --git a/utils/dvb/libsat.h b/utils/dvb/libsat.h index dec196e..cb78cbb 100644 --- a/utils/dvb/libsat.h +++ b/utils/dvb/libsat.h @@ -1,3 +1,22 @@ +/* + * Copyright (c) 2011-2012 - Mauro Carvalho Chehab + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation version 2 + * of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Or, point your browser to http://www.gnu.org/licenses/old-licenses/gpl-2.0.html + */ + enum polarization { POLARIZATION_OFF = 0, POLARIZATION_H = 1, diff --git a/utils/dvb/libscan.c b/utils/dvb/libscan.c index 06e02c7..8efe9af 100644 --- a/utils/dvb/libscan.c +++ b/utils/dvb/libscan.c @@ -1,3 +1,22 @@ +/* + * Copyright (c) 2011-2012 - Mauro Carvalho Chehab + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation version 2 + * of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Or, point your browser to http://www.gnu.org/licenses/old-licenses/gpl-2.0.html + */ + /****************************************************************************** * Parse DVB tables * According with: diff --git a/utils/dvb/libscan.h b/utils/dvb/libscan.h index 738dce1..441472e 100644 --- a/utils/dvb/libscan.h +++ b/utils/dvb/libscan.h @@ -1,3 +1,22 @@ +/* + * Copyright (c) 2011-2012 - Mauro Carvalho Chehab + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation version 2 + * of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Or, point your browser to http://www.gnu.org/licenses/old-licenses/gpl-2.0.html + */ + #include #include diff --git a/utils/dvb/parse_string.c b/utils/dvb/parse_string.c index 37f5c3a..f4d45b8 100644 --- a/utils/dvb/parse_string.c +++ b/utils/dvb/parse_string.c @@ -1,4 +1,23 @@ /* + * Copyright (c) 2011-2012 - Mauro Carvalho Chehab + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation version 2 + * of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Or, point your browser to http://www.gnu.org/licenses/old-licenses/gpl-2.0.html + */ + +/* * handle character set correctly (e.g. via iconv) * c.f. EN 300 468 annex A */ diff --git a/utils/dvb/parse_string.h b/utils/dvb/parse_string.h index 27e1515..ca30a23 100644 --- a/utils/dvb/parse_string.h +++ b/utils/dvb/parse_string.h @@ -1,3 +1,22 @@ +/* + * Copyright (c) 2011-2012 - Mauro Carvalho Chehab + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation version 2 + * of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Or, point your browser to http://www.gnu.org/licenses/old-licenses/gpl-2.0.html + */ + void parse_string(char **dest, char **emph, const unsigned char *src, size_t len, char *default_charset, char *output_charset); -- 2.7.4