From 463d6e68a8f42423169e4359cc5c8636f6c92589 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Fri, 24 Jul 2020 17:28:11 +0300
Subject: Release version 1.6.3+4

Fix GCC 10 -Wformat warning

Canonicalize license in manifest

Add glue buildfile

Fix typo in .gitattributes
---
 libpkgconf/tests/api/driver.c   | 17 +++++++----------
 libpkgconf/tests/basic/driver.c | 18 ++++++------------
 2 files changed, 13 insertions(+), 22 deletions(-)

(limited to 'libpkgconf/tests')

diff --git a/libpkgconf/tests/api/driver.c b/libpkgconf/tests/api/driver.c
index 6035771..15b0685 100644
--- a/libpkgconf/tests/api/driver.c
+++ b/libpkgconf/tests/api/driver.c
@@ -2,8 +2,7 @@
  * license   : ISC; see accompanying COPYING file
  */
 
-/*
- * Enable assertions.
+/* Enable assertions.
  */
 #ifdef NDEBUG
 #  undef NDEBUG
@@ -23,8 +22,7 @@ error_handler (const char* msg, const pkgconf_client_t* c, const void* d)
   (void) c; /* Unused. */
   (void) d; /* Unused. */
 
-  /*
-   * Seems it always have a trailing newline char. Probably it still a good
+  /* Seems it always have a trailing newline char. Probably it still a good
    * idea to check if it is. Let's see if it ever be missed.
    *
    */
@@ -53,15 +51,14 @@ tuples_print (pkgconf_list_t *list)
   {
     pkgconf_tuple_t *tuple = node->data;
 
-    // Skip the automatically added variable.
-    //
+    /* Skip the automatically added variable.
+     */
     if (strcmp (tuple->key, "pcfiledir") != 0)
       printf("%s %s\n", tuple->key, tuple->value);
   }
 }
 
-/*
- * Usage: argv[0] (--cflags|--libs|--vars) <path>
+/* Usage: argv[0] (--cflags|--libs|--vars) <path>
  *
  * Print package compiler flags, linker flags or variable name/values one per
  * line. The specified package file must have .pc extension.
@@ -115,8 +112,8 @@ main (int argc, const char* argv[])
   assert (i + 1 == argc);
   const char* path = argv[i];
 
-  // Make sure the file has .pc extension.
-  //
+  /* Make sure the file has .pc extension.
+   */
   size_t n = strlen (path);
   assert (n > 3 && strcmp (path + n - 3, ".pc") == 0);
 
diff --git a/libpkgconf/tests/basic/driver.c b/libpkgconf/tests/basic/driver.c
index c443d1a..b974592 100644
--- a/libpkgconf/tests/basic/driver.c
+++ b/libpkgconf/tests/basic/driver.c
@@ -2,8 +2,7 @@
  * license   : ISC; see accompanying COPYING file
  */
 
-/*
- * Enable assertions.
+/* Enable assertions.
  */
 #ifdef NDEBUG
 #  undef NDEBUG
@@ -24,8 +23,7 @@ error_handler (const char* msg, const pkgconf_client_t* c, const void* d)
   (void) c; /* Unused. */
   (void) d; /* Unused. */
 
-  /*
-   * Seems it always have a trailing newline char. Probably it still a good
+  /* Seems it always have a trailing newline char. Probably it still a good
    * idea to check if it is. Let's see if it ever be missed.
    *
    */
@@ -45,8 +43,7 @@ print_and_free (pkgconf_list_t* list)
   pkgconf_fragment_free (list);
 }
 
-/*
- * Usage: argv[0] [--cflags] [--libs] (--with-path <dir>)* <name>
+/* Usage: argv[0] [--cflags] [--libs] (--with-path <dir>)* <name>
  *
  * Print package compiler and linker flags. If the package name has '.pc'
  * extension it is interpreted as a file name. Prints all flags, as pkgconf
@@ -109,8 +106,7 @@ main (int argc, const char* argv[])
 
   pkgconf_client_set_flags (c, client_flags);
 
-  /*
-   * Bootstrap the package search default paths if not specified explicitly.
+  /* Bootstrap the package search default paths if not specified explicitly.
    */
   if (default_dirs)
     pkgconf_client_dir_list_build (c, pkgconf_cross_personality_default ());
@@ -121,8 +117,7 @@ main (int argc, const char* argv[])
   {
     int e = PKGCONF_PKG_ERRF_OK;
 
-    /*
-     * Print C flags.
+    /* Print C flags.
      */
     if (cflags)
     {
@@ -139,8 +134,7 @@ main (int argc, const char* argv[])
       pkgconf_client_set_flags (c, client_flags); /* Restore. */
     }
 
-    /*
-     * Print libs.
+    /* Print libs.
      */
     if (libs && e == PKGCONF_PKG_ERRF_OK)
     {
-- 
cgit v1.1