summaryrefslogtreecommitdiff
path: root/libgphoto2_port/libgphoto2_port
diff options
context:
space:
mode:
authorSiim Meerits <sh0@yutani.ee>2020-07-27 17:37:00 +0300
committerSiim Meerits <sh0@yutani.ee>2020-07-27 17:37:00 +0300
commit456a1d598bccc260b233d2e91c469be452e0fbef (patch)
treec1288655494c94292f6e2eb26d722958899c7107 /libgphoto2_port/libgphoto2_port
parentaf2c0e0558e78cae06371abef36f43ca74a9c5c0 (diff)
downloadlibgphoto2-456a1d598bccc260b233d2e91c469be452e0fbef.tar.gz
Remove trailing whitespace from all *.h and *.c files.
Diffstat (limited to 'libgphoto2_port/libgphoto2_port')
-rw-r--r--libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c14
-rw-r--r--libgphoto2_port/libgphoto2_port/gphoto2-port-info.h6
-rw-r--r--libgphoto2_port/libgphoto2_port/gphoto2-port-log.c36
-rw-r--r--libgphoto2_port/libgphoto2_port/gphoto2-port-portability.c30
-rw-r--r--libgphoto2_port/libgphoto2_port/gphoto2-port-result.c8
-rw-r--r--libgphoto2_port/libgphoto2_port/gphoto2-port-version.c6
-rw-r--r--libgphoto2_port/libgphoto2_port/gphoto2-port.c40
7 files changed, 70 insertions, 70 deletions
diff --git a/libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c b/libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c
index 316bbe8b8..9ea85f030 100644
--- a/libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c
+++ b/libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c
@@ -9,10 +9,10 @@
* version 2 of the License, or (at your option) any later version.
*
* \par
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library 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
- * Lesser General Public License for more details.
+ * Lesser General Public License for more details.
*
* \par
* You should have received a copy of the GNU Lesser General Public
@@ -53,7 +53,7 @@
# define N_(String) gettext_noop (String)
# else
# define N_(String) (String)
-# endif
+# endif
#else
# define textdomain(String) (String)
# define gettext(String) (String)
@@ -88,7 +88,7 @@ struct _GPPortInfoList {
*
* This function is called by the gp_message_codeset() function, there is
* no need to call it yourself.
- *
+ *
* \param codeset new codeset to use
* \return the previous codeset
*/
@@ -167,7 +167,7 @@ gp_port_info_list_free (GPPortInfoList *list)
* Appends an entry to the list. This function is typically called by
* an io-driver during #gp_port_library_list. If you leave info.name blank,
* #gp_port_info_list_lookup_path will try to match non-existent paths
- * against info.path and - if successful - will append this entry to the
+ * against info.path and - if successful - will append this entry to the
* list.
*
* \return A gphoto2 error code, or an index into the port list (excluding generic entries).
@@ -260,7 +260,7 @@ foreach_func (const char *filename, lt_ptr data)
/**
* \brief Load system ports
- *
+ *
* \param list a #GPPortInfoList
*
* Searches the system for io-drivers and appends them to the list. You would
diff --git a/libgphoto2_port/libgphoto2_port/gphoto2-port-info.h b/libgphoto2_port/libgphoto2_port/gphoto2-port-info.h
index a0db54b73..720e0c8dd 100644
--- a/libgphoto2_port/libgphoto2_port/gphoto2-port-info.h
+++ b/libgphoto2_port/libgphoto2_port/gphoto2-port-info.h
@@ -9,10 +9,10 @@
* version 2 of the License, or (at your option) any later version.
*
* \par
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library 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
- * Lesser General Public License for more details.
+ * Lesser General Public License for more details.
*
* \par
* You should have received a copy of the GNU Lesser General Public
diff --git a/libgphoto2_port/libgphoto2_port/gphoto2-port-log.c b/libgphoto2_port/libgphoto2_port/gphoto2-port-log.c
index 6bf15f6c5..df63197d7 100644
--- a/libgphoto2_port/libgphoto2_port/gphoto2-port-log.c
+++ b/libgphoto2_port/libgphoto2_port/gphoto2-port-log.c
@@ -9,10 +9,10 @@
* version 2 of the License, or (at your option) any later version.
*
* \par
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library 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
- * Lesser General Public License for more details.
+ * Lesser General Public License for more details.
*
* \par
* You should have received a copy of the GNU Lesser General Public
@@ -48,9 +48,9 @@
#endif
#ifndef DISABLE_DEBUGGING
-/**
+/**
* \brief Internal logging function entry.
- *
+ *
* Internal structure to remember the logging functions.
* Use gp_log_add_func() and gp_log_remove_func() to access it.
*/
@@ -150,7 +150,7 @@ gp_log_remove_func (int id)
}
/**
- * Width of offset field in characters. Note that HEXDUMP_COMPLETE_LINE
+ * Width of offset field in characters. Note that HEXDUMP_COMPLETE_LINE
* needs to be changed when this value is changed.
*/
#define HEXDUMP_OFFSET_WIDTH 4
@@ -175,7 +175,7 @@ gp_log_remove_func (int id)
/**
* We are lazy and do our typing only once. Please note that you have
- * to add/remove some lines when increasing/decreasing the values of
+ * to add/remove some lines when increasing/decreasing the values of
* HEXDUMP_BLOCK_DISTANCE and/or HEXDUMP_OFFSET_WIDTH.
*/
#define HEXDUMP_COMPLETE_LINE {\
@@ -293,7 +293,7 @@ exit:
* \param args the va_list corresponding to format
*
* Logs a message at the given log level. You would normally use this
- * function to log as yet unformatted strings.
+ * function to log as yet unformatted strings.
**/
void
gp_logv (GPLogLevel level, const char *domain, const char *format,
@@ -416,11 +416,11 @@ gp_log_with_source_location(GPLogLevel level, const char *file, int line, const
#ifdef _GPHOTO2_INTERNAL_CODE
-/**
+/**
* \brief (Internal) translate a enumeration code to a string
*/
const char *
-gpi_enum_to_string(unsigned int _enum,
+gpi_enum_to_string(unsigned int _enum,
const StringFlagItem *map)
{
int i;
@@ -433,7 +433,7 @@ gpi_enum_to_string(unsigned int _enum,
return NULL;
}
-/**
+/**
* \brief (Internal) translate a string to an enumeration code
*/
int
@@ -452,7 +452,7 @@ gpi_string_to_enum(const char *str,
}
void
-gpi_flags_to_string_list(unsigned int flags,
+gpi_flags_to_string_list(unsigned int flags,
const StringFlagItem *map,
string_item_func func, void *data)
{
@@ -462,13 +462,13 @@ gpi_flags_to_string_list(unsigned int flags,
func(map[i].str, data);
break;
} else if (0 != (flags & map[i].flag)) {
- func(map[i].str, data);
+ func(map[i].str, data);
}
}
}
-unsigned int
-gpi_string_to_flag(const char *str,
+unsigned int
+gpi_string_to_flag(const char *str,
const StringFlagItem *map)
{
int i;
@@ -480,8 +480,8 @@ gpi_string_to_flag(const char *str,
return 0;
}
-int
-gpi_string_or_to_flags(const char *str,
+int
+gpi_string_or_to_flags(const char *str,
unsigned int *flags,
const StringFlagItem *map)
{
@@ -501,7 +501,7 @@ gpi_string_or_to_flags(const char *str,
}
unsigned int
-gpi_string_list_to_flags(const char *str[],
+gpi_string_list_to_flags(const char *str[],
const StringFlagItem *map)
{
int i;
diff --git a/libgphoto2_port/libgphoto2_port/gphoto2-port-portability.c b/libgphoto2_port/libgphoto2_port/gphoto2-port-portability.c
index 7787a78be..0b40a6af9 100644
--- a/libgphoto2_port/libgphoto2_port/gphoto2-port-portability.c
+++ b/libgphoto2_port/libgphoto2_port/gphoto2-port-portability.c
@@ -1,5 +1,5 @@
/** \file
- *
+ *
* \author Copyright 2001 Lutz Mueller <lutz@users.sf.net>
* \author Copyright 1999 Scott Fritzinger <scottf@unr.edu>
*
@@ -10,10 +10,10 @@
* version 2 of the License, or (at your option) any later version.
*
* \par
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library 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
- * Lesser General Public License for more details.
+ * Lesser General Public License for more details.
*
* \par
* You should have received a copy of the GNU Lesser General Public
@@ -169,10 +169,10 @@ int gp_system_is_dir (const char *dirname) {
#else
-/**
+/**
* \brief mkdir UNIX functionality
* \param dirname directory to create
- *
+ *
* Creates a new directory.
*
* \return a gphoto error code
@@ -186,7 +186,7 @@ int gp_system_mkdir (const char *dirname) {
/**
* \brief rmdir UNIX functionality
* \param dirname directory to remove
- *
+ *
* Removes a empty directory.
*
* \return a gphoto error code
@@ -202,8 +202,8 @@ int gp_system_rmdir (const char *dirname) {
/**
* \brief opendir UNIX functionality
* \param dirname directory to open
- *
- * Opens a directory for readdir and later closedir operations,
+ *
+ * Opens a directory for readdir and later closedir operations,
* to enumerate its contents.
*
* \return a directory handle for use in gp_system_readdir() and gp_system_closedir()
@@ -215,7 +215,7 @@ gp_system_dir gp_system_opendir (const char *dirname) {
/**
* \brief readdir UNIX functionality
* \param d directory to enumerate
- *
+ *
* Reads one directory entry from the specified directory handle
* as returned from gp_system_opendir(). Use gp_system_filename()
* to extract the filename from the returned value.
@@ -229,7 +229,7 @@ gp_system_dirent gp_system_readdir (gp_system_dir d) {
/**
* \brief retrieve UNIX filename out of a directory entry
* \param de directory entry as returned from gp_system_readdir()
- *
+ *
* Extracts a filename out of the passed directory entry.
*
* \return the filename of the directory entry
@@ -241,8 +241,8 @@ const char *gp_system_filename (gp_system_dirent de) {
/**
* \brief closedir UNIX functionality
* \param dir directory to close
- *
- * Closes a directory after readdir operations.
+ *
+ * Closes a directory after readdir operations.
*
* \return a gphoto error code
*/
@@ -254,7 +254,7 @@ int gp_system_closedir (gp_system_dir dir) {
/**
* \brief check if passed filename is a file
* \param filename file name to check
- *
+ *
* Checks whether the passed in filename is
* a file and returns this as boolean.
*
@@ -271,7 +271,7 @@ int gp_system_is_file (const char *filename) {
/**
* \brief check if passed filename is a directory
* \param dirname file name to check
- *
+ *
* Checks whether the passed in dirname is
* a directory and returns this as boolean.
*
diff --git a/libgphoto2_port/libgphoto2_port/gphoto2-port-result.c b/libgphoto2_port/libgphoto2_port/gphoto2-port-result.c
index 653176935..8b0c19eb6 100644
--- a/libgphoto2_port/libgphoto2_port/gphoto2-port-result.c
+++ b/libgphoto2_port/libgphoto2_port/gphoto2-port-result.c
@@ -7,10 +7,10 @@
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library 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
- * Lesser General Public License for more details.
+ * Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
@@ -23,7 +23,7 @@
#ifdef ENABLE_NLS
# include <libintl.h>
-# undef _
+# undef _
# define _(String) dgettext (GETTEXT_PACKAGE, String)
# ifdef gettext_noop
# define N_(String) gettext_noop (String)
diff --git a/libgphoto2_port/libgphoto2_port/gphoto2-port-version.c b/libgphoto2_port/libgphoto2_port/gphoto2-port-version.c
index 136b78358..10724ab0f 100644
--- a/libgphoto2_port/libgphoto2_port/gphoto2-port-version.c
+++ b/libgphoto2_port/libgphoto2_port/gphoto2-port-version.c
@@ -7,10 +7,10 @@
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library 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
- * Lesser General Public License for more details.
+ * Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
diff --git a/libgphoto2_port/libgphoto2_port/gphoto2-port.c b/libgphoto2_port/libgphoto2_port/gphoto2-port.c
index 8f84482a2..71c9d4e21 100644
--- a/libgphoto2_port/libgphoto2_port/gphoto2-port.c
+++ b/libgphoto2_port/libgphoto2_port/gphoto2-port.c
@@ -1,6 +1,6 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
/** \file
- *
+ *
* \author Copyright 2001 Lutz Mueller <lutz@users.sf.net>
* \author Copyright 1999 Scott Fritzinger <scottf@unr.edu>
*
@@ -11,10 +11,10 @@
* version 2 of the License, or (at your option) any later version.
*
* \par
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library 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
- * Lesser General Public License for more details.
+ * Lesser General Public License for more details.
*
* \par
* You should have received a copy of the GNU Lesser General Public
@@ -83,7 +83,7 @@ struct _GPPortPrivateCore {
*
* Allocate and initialize the memory for a new #GPPort.
*
- * After you called this function,
+ * After you called this function,
* you probably want to call #gp_port_set_info in order to make the newly
* created port functional.
*
@@ -139,7 +139,7 @@ gp_port_exit (GPPort *port)
* information (from the serial:/dev/ttyS0 or similar variables).
* After calling this function, you can access the port using for
* example gp_port_open().
- *
+ *
* \param port a GPPort
* \param info the GPPortInfo to set
*
@@ -264,7 +264,7 @@ gp_port_get_info (GPPort *port, GPPortInfo *info)
* \brief Open a port.
* \param port a #GPPort
*
- * Opens a port which should have been created with #gp_port_new and
+ * Opens a port which should have been created with #gp_port_new and
* configured with #gp_port_set_info and #gp_port_set_settings
*
* \return a gphoto2 error code
@@ -520,7 +520,7 @@ gp_port_check_int_fast (GPPort *port, char *data, int size)
/**
- * \brief Set timeout of port
+ * \brief Set timeout of port
* \param port a #GPPort
* \param timeout the timeout
*
@@ -595,7 +595,7 @@ gp_port_set_settings (GPPort *port, GPPortSettings settings)
CHECK_INIT (port);
/*
- * We copy the settings to settings_pending and call update on the
+ * We copy the settings to settings_pending and call update on the
* port.
*/
memcpy (&port->settings_pending, &settings,
@@ -644,7 +644,7 @@ gp_port_get_settings (GPPort *port, GPPortSettings *settings)
* \param port a GPPort
* \param pin the serial pin to be retrieved
* \param level the setting of the pin
- *
+ *
* \return a gphoto2 error code
*/
int
@@ -915,8 +915,8 @@ gp_port_usb_msg_read (GPPort *port, int request, int value, int index,
return (retval);
}
-/*
- * The next two functions handle the request types 0x41 for write
+/*
+ * The next two functions handle the request types 0x41 for write
* and 0xc1 for read.
*/
/**
@@ -934,7 +934,7 @@ gp_port_usb_msg_read (GPPort *port, int request, int value, int index,
* \return a gphoto2 error code
*/
int
-gp_port_usb_msg_interface_write (GPPort *port, int request,
+gp_port_usb_msg_interface_write (GPPort *port, int request,
int value, int index, char *bytes, int size)
{
int retval;
@@ -946,7 +946,7 @@ gp_port_usb_msg_interface_write (GPPort *port, int request,
CHECK_INIT (port);
CHECK_SUPP (port, "msg_build", port->pc->ops->msg_interface_write);
- retval = port->pc->ops->msg_interface_write(port, request,
+ retval = port->pc->ops->msg_interface_write(port, request,
value, index, bytes, size);
CHECK_RESULT (retval);
@@ -981,7 +981,7 @@ gp_port_usb_msg_interface_read (GPPort *port, int request, int value, int index,
CHECK_INIT (port);
CHECK_SUPP (port, "msg_read", port->pc->ops->msg_interface_read);
- retval = port->pc->ops->msg_interface_read (port, request,
+ retval = port->pc->ops->msg_interface_read (port, request,
value, index, bytes, size);
CHECK_RESULT (retval);
@@ -992,8 +992,8 @@ gp_port_usb_msg_interface_read (GPPort *port, int request, int value, int index,
}
-/*
- * The next two functions handle the request types 0x21 for write
+/*
+ * The next two functions handle the request types 0x21 for write
* and 0xa1 for read.
*/
@@ -1012,7 +1012,7 @@ gp_port_usb_msg_interface_read (GPPort *port, int request, int value, int index,
* \return a gphoto2 error code
*/
int
-gp_port_usb_msg_class_write (GPPort *port, int request,
+gp_port_usb_msg_class_write (GPPort *port, int request,
int value, int index, char *bytes, int size)
{
int retval;
@@ -1024,7 +1024,7 @@ gp_port_usb_msg_class_write (GPPort *port, int request,
CHECK_INIT (port);
CHECK_SUPP (port, "msg_build", port->pc->ops->msg_class_write);
- retval = port->pc->ops->msg_class_write(port, request,
+ retval = port->pc->ops->msg_class_write(port, request,
value, index, bytes, size);
CHECK_RESULT (retval);
@@ -1059,7 +1059,7 @@ gp_port_usb_msg_class_read (GPPort *port, int request, int value, int index,
CHECK_INIT (port);
CHECK_SUPP (port, "msg_read", port->pc->ops->msg_class_read);
- retval = port->pc->ops->msg_class_read (port, request,
+ retval = port->pc->ops->msg_class_read (port, request,
value, index, bytes, size);
CHECK_RESULT (retval);