[Xfce4-commits] [thunar-plugins/thunar-shares-plugin] 01/02: Fix a bunch of compile warnings

noreply at xfce.org noreply at xfce.org
Fri Sep 5 14:54:52 CEST 2014


This is an automated email from the git hooks/post-receive script.

danielm pushed a commit to branch thunarx-2
in repository thunar-plugins/thunar-shares-plugin.

commit 4f7308141c759726a83eec00575371794008ed81
Author: Daniel Morales <daniel at daniel.com.uy>
Date:   Fri Sep 5 09:52:38 2014 -0300

    Fix a bunch of compile warnings
---
 INSTALL                              |  106 ++++++++++++++++++++++++++++------
 configure.in.in                      |   66 ++++-----------------
 libshares/shares.c                   |    2 +-
 thunar-plugin/thunar-shares-plugin.c |    5 ++
 thunar-plugin/tsp-page.c             |    2 -
 thunar-plugin/tsp-provider.c         |    2 -
 6 files changed, 103 insertions(+), 80 deletions(-)

diff --git a/INSTALL b/INSTALL
index 2550dab..a1e89e1 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,11 +1,13 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
+Inc.
 
-   This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+   Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
 
 Basic Installation
 ==================
@@ -13,7 +15,11 @@ Basic Installation
    Briefly, the shell commands `./configure; make; make install' should
 configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
+instructions specific to this package.  Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below.  The lack of an optional feature in a given package is not
+necessarily a bug.  More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
 
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -42,7 +48,7 @@ may remove or edit it.
 you want to change it or regenerate `configure' using a newer version
 of `autoconf'.
 
-The simplest way to compile this package is:
+   The simplest way to compile this package is:
 
   1. `cd' to the directory containing the package's source code and type
      `./configure' to configure the package for your system.
@@ -53,12 +59,22 @@ The simplest way to compile this package is:
   2. Type `make' to compile the package.
 
   3. Optionally, type `make check' to run any self-tests that come with
-     the package.
+     the package, generally using the just-built uninstalled binaries.
 
   4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
+     documentation.  When installing into a prefix owned by root, it is
+     recommended that the package be configured and built as a regular
+     user, and only the `make install' phase executed with root
+     privileges.
+
+  5. Optionally, type `make installcheck' to repeat any self-tests, but
+     this time using the binaries in their final installed location.
+     This target does not install anything.  Running this target as a
+     regular user, particularly if the prior `make install' required
+     root privileges, verifies that the installation completed
+     correctly.
+
+  6. You can remove the program binaries and object files from the
      source code directory by typing `make clean'.  To also remove the
      files that `configure' created (so you can compile the package for
      a different kind of computer), type `make distclean'.  There is
@@ -67,8 +83,15 @@ The simplest way to compile this package is:
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
-  6. Often, you can also type `make uninstall' to remove the installed
-     files again.
+  7. Often, you can also type `make uninstall' to remove the installed
+     files again.  In practice, not all packages have tested that
+     uninstallation works correctly, even though it is required by the
+     GNU Coding Standards.
+
+  8. Some packages, particularly those that use Automake, provide `make
+     distcheck', which can by used by developers to test that all other
+     targets like `make install' and `make uninstall' work correctly.
+     This target is generally not run by end users.
 
 Compilers and Options
 =====================
@@ -93,7 +116,8 @@ same time, by placing the object files for each architecture in their
 own directory.  To do this, you can use GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
+source code in the directory that `configure' is in and in `..'.  This
+is known as a "VPATH" build.
 
    With a non-GNU `make', it is safer to compile the package for one
 architecture at a time in the source code directory.  After you have
@@ -120,7 +144,8 @@ Installation Names
    By default, `make install' installs the package's commands under
 `/usr/local/bin', include files under `/usr/local/include', etc.  You
 can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
@@ -131,15 +156,46 @@ Documentation and other data files still use the regular prefix.
    In addition, if you use an unusual directory layout you can give
 options like `--bindir=DIR' to specify different values for particular
 kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
+you can set and what kinds of files go in them.  In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+   The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+   The first method involves providing an override variable for each
+affected directory.  For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'.  Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated.  The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+   The second method involves providing the `DESTDIR' variable.  For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names.  The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters.  On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
 
    If the package supports it, you can cause programs to be installed
 with an extra prefix or suffix on their names by giving `configure' the
 option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 
-Optional Features
-=================
-
    Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
@@ -152,6 +208,13 @@ find the X include and library files automatically, but if it doesn't,
 you can use the `configure' options `--x-includes=DIR' and
 `--x-libraries=DIR' to specify their locations.
 
+   Some packages offer the ability to configure how verbose the
+execution of `make' will be.  For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
 Particular systems
 ==================
 
@@ -163,6 +226,11 @@ order to use an ANSI C compiler:
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
+   HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved.  Use GNU `make'
+instead.
+
    On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
 parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
 a workaround.  If GNU CC is not installed, it is therefore recommended
@@ -288,7 +356,7 @@ operates.
      `configure' can determine that directory automatically.
 
 `--prefix=DIR'
-     Use DIR as the installation prefix.  *Note Installation Names::
+     Use DIR as the installation prefix.  *note Installation Names::
      for more details, including other options available for fine-tuning
      the installation locations.
 
diff --git a/configure.in.in b/configure.in.in
index cfcf92e..d858444 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -30,8 +30,8 @@ AC_CANONICAL_TARGET()
 dnl -------------------------------------------------------
 dnl Init automake
 dnl -------------------------------------------------------
-AM_INIT_AUTOMAKE([1.9])
-AM_CONFIG_HEADER([config.h])
+AM_INIT_AUTOMAKE([1.9 dist-bzip2 tar-ustar no-dist-gzip])
+AC_CONFIG_HEADERS([config.h])
 AM_MAINTAINER_MODE
 
 AC_ISC_POSIX
@@ -43,10 +43,15 @@ dnl -------------------------------------------------------
 AC_PROG_CC
 AC_PROG_LD
 AC_PROG_INSTALL
-AC_PROG_LIBTOOL
 AC_PROG_INTLTOOL([0.31])
 
 dnl -------------------------------------------------------
+dnl Initialize libtool
+dnl-------------------------------------------------------
+LT_PREREQ([2.2.6])
+LT_INIT([disable-static])
+
+dnl -------------------------------------------------------
 dnl Check headers
 dnl -------------------------------------------------------
 AC_CHECK_HEADERS([string.h sys/types.h sys/wait.h time.h sys/stat.h unistd.h]) 
@@ -66,63 +71,12 @@ XDT_I18N([@LINGUAS@])
 dnl -------------------------------------------------------
 dnl Debugging support
 dnl -------------------------------------------------------
-AC_ARG_ENABLE([debug],
-AC_HELP_STRING([--enable-debug=@<:@no/minimum/yes/full@:>@], [Turn on debugging @<:@default=tsp_debug_default@:>@]),
-  [], [enable_debug=tsp_debug_default])
-AC_MSG_CHECKING([whether to enable debugging support])
-if test x"$enable_debug" = x"full" -o x"$enable_debug" = x"yes"; then
-  dnl Check whether the compiler accepts the -fno-strict-aliasing
-  dnl switch, as certain packages - like Glib - still dont work
-  dnl properly with newer compilers.
-  save_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -fno-strict-aliasing"
-  AC_MSG_CHECKING([whether $CC accepts -fno-strict-aliasing])
-  AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [
-    AC_MSG_RESULT([yes])
-    PLATFORM_CFLAGS="$PLATFORM_CFLAGS -fno-strict-aliasing"
-  ], [
-    AC_MSG_RESULT([no])
-  ])
-  CFLAGS="$save_CFLAGS"
-
-  dnl Make sure we detect possible errors
-  PLATFORM_CFLAGS="$PLATFORM_CFLAGS -Werror -Wall"
-
-  dnl Paranoia for --enable-debug=full
-  if test x"$enable_debug" = x"full"; then
-    PLATFORM_CFLAGS="$PLATFORM_CFLAGS -O0 -g3"
-    PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_DISABLE_DEPRECATED -DG_ENABLE_DEBUG"
-  fi
-else
-  dnl Disable object cast checks
-  PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_DISABLE_CAST_CHECKS"
-
-  dnl Disable all checks for --enable-debug=no
-  if test x"$enable_debug" = x"no"; then
-    PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS"
-  fi
-fi
+XDT_FEATURE_DEBUG([tsp_debug_default])
 
 dnl -------------------------------------------------------
 dnl Check for linker optimizations
 dnl -------------------------------------------------------
-AC_MSG_CHECKING([whether $LD accepts -O1])
-case `$LD -O1 -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -Wl,-O1"
-  AC_MSG_RESULT([yes])
-  ;;
-*)
-  AC_MSG_RESULT([no])
-  ;;
-esac
-
-dnl -------------------------------------------------------
-dnl Export vars
-dnl -------------------------------------------------------
-AC_SUBST(PLATFORM_CPPFLAGS)
-AC_SUBST(PLATFORM_CFLAGS)
-AC_SUBST(PLATFORM_LDFLAGS)
+XDT_FEATURE_LINKER_OPTS()
 
 AC_OUTPUT([
 	Makefile
diff --git a/libshares/shares.c b/libshares/shares.c
index e5d2836..fb82e5a 100644
--- a/libshares/shares.c
+++ b/libshares/shares.c
@@ -1118,7 +1118,7 @@ shares_free_share_info_list (GSList *list)
 		ShareInfo *info;
 
 		info = l->data;
-		shares_free_share_info (l->data);
+		shares_free_share_info (info);
 	}
 
 	g_slist_free (list);
diff --git a/thunar-plugin/thunar-shares-plugin.c b/thunar-plugin/thunar-shares-plugin.c
index 20475b1..7cc4324 100644
--- a/thunar-plugin/thunar-shares-plugin.c
+++ b/thunar-plugin/thunar-shares-plugin.c
@@ -28,6 +28,11 @@
 #include "tsp-provider.h"
 #include "tsp-page.h"
 
+G_MODULE_EXPORT void thunar_extension_initialize (ThunarxProviderPlugin *plugin);
+G_MODULE_EXPORT void thunar_extension_shutdown   (void);
+G_MODULE_EXPORT void thunar_extension_list_types (const GType          **types,
+                                                  gint                  *n_types);
+
 static GType type_list[1];
 
 G_MODULE_EXPORT void
diff --git a/thunar-plugin/tsp-page.c b/thunar-plugin/tsp-page.c
index 3e38389..0c70630 100644
--- a/thunar-plugin/tsp-page.c
+++ b/thunar-plugin/tsp-page.c
@@ -37,8 +37,6 @@ enum
   PROP_FILE,
 };
 
-static void tsp_page_class_init    (TspPageClass    *klass);
-static void tsp_page_init          (TspPage         *page);
 static void tsp_page_finalize      (GObject         *object);
 static void tsp_page_get_property  (GObject         *object,
                                     guint            prop_id,
diff --git a/thunar-plugin/tsp-provider.c b/thunar-plugin/tsp-provider.c
index b6a792d..a5d9ab5 100644
--- a/thunar-plugin/tsp-provider.c
+++ b/thunar-plugin/tsp-provider.c
@@ -29,8 +29,6 @@
 #include "tsp-provider.h"
 #include "tsp-page.h"
 
-static void     tsp_provider_class_init          (TspProviderClass                 *klass);
-static void     tsp_provider_init                (TspProvider                      *tsp_provider);
 static void     tsp_provider_finalize            (GObject                          *object);
 
 static void     tsp_provider_page_provider_init  (ThunarxPropertyPageProviderIface *iface);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Xfce4-commits mailing list