summaryrefslogtreecommitdiff
path: root/extras/volume_id/lib/util.c
diff options
context:
space:
mode:
Diffstat (limited to 'extras/volume_id/lib/util.c')
-rw-r--r--extras/volume_id/lib/util.c20
1 files changed, 12 insertions, 8 deletions
diff --git a/extras/volume_id/lib/util.c b/extras/volume_id/lib/util.c
index e71d6208c5..0fb8937962 100644
--- a/extras/volume_id/lib/util.c
+++ b/extras/volume_id/lib/util.c
@@ -3,19 +3,24 @@
*
* Copyright (C) 2005-2007 Kay Sievers <kay.sievers@vrfy.org>
*
- * 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 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 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, see <http://www.gnu.org/licenses/>.
*/
#ifndef _GNU_SOURCE
#define _GNU_SOURCE 1
#endif
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -27,7 +32,6 @@
#include "libvolume_id.h"
#include "libvolume_id-private.h"
-#include "util.h"
/* count of characters used to encode one unicode char */
static int utf8_encoded_expected_len(const char *str)