summaryrefslogtreecommitdiff
path: root/gphoto2
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 /gphoto2
parentaf2c0e0558e78cae06371abef36f43ca74a9c5c0 (diff)
downloadlibgphoto2-456a1d598bccc260b233d2e91c469be452e0fbef.tar.gz
Remove trailing whitespace from all *.h and *.c files.
Diffstat (limited to 'gphoto2')
-rw-r--r--gphoto2/gphoto2-abilities-list.h10
-rw-r--r--gphoto2/gphoto2-camera.h64
-rw-r--r--gphoto2/gphoto2-context.h10
-rw-r--r--gphoto2/gphoto2-file.h6
-rw-r--r--gphoto2/gphoto2-filesys.h24
-rw-r--r--gphoto2/gphoto2-library.h12
-rw-r--r--gphoto2/gphoto2-list.h14
-rw-r--r--gphoto2/gphoto2-result.h14
-rw-r--r--gphoto2/gphoto2-setting.h6
-rw-r--r--gphoto2/gphoto2-version.h6
-rw-r--r--gphoto2/gphoto2-widget.h18
-rw-r--r--gphoto2/gphoto2.h6
12 files changed, 95 insertions, 95 deletions
diff --git a/gphoto2/gphoto2-abilities-list.h b/gphoto2/gphoto2-abilities-list.h
index 024950fd1..58eb3d033 100644
--- a/gphoto2/gphoto2-abilities-list.h
+++ b/gphoto2/gphoto2-abilities-list.h
@@ -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
@@ -111,7 +111,7 @@ typedef enum {
#endif /* _GPHOTO2_INTERNAL_CODE */
-/**
+/**
* \brief Describes the properties of a specific camera.
*
* The internals of this structures are used extensively by the
@@ -142,7 +142,7 @@ typedef struct {
char id [1024]; /**< \brief (Internal) camera ID name */
GphotoDeviceType device_type; /**< \brief Device type. */
- /** Reserved space to use in the future w/out changing the
+ /** Reserved space to use in the future w/out changing the
* struct size */
int reserved2; /**< reserved space \internal */
int reserved3; /**< reserved space \internal */
diff --git a/gphoto2/gphoto2-camera.h b/gphoto2/gphoto2-camera.h
index 8f204745f..f9ee30911 100644
--- a/gphoto2/gphoto2-camera.h
+++ b/gphoto2/gphoto2-camera.h
@@ -11,10 +11,10 @@
* version 2 of the License, or (at your option) any later version.
*
* \note
- * 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.
*
* \note
* You should have received a copy of the GNU Lesser General Public
@@ -35,7 +35,7 @@ extern "C" {
*
* A Camera object represents a specific instance of a (physical of
* virtual) camera attached to the system.
- *
+ *
* The abilities of this type of camera are stored in a CameraAbility
* object.
*
@@ -58,7 +58,7 @@ typedef struct _Camera Camera;
extern "C" {
#endif /* __cplusplus */
-/**
+/**
* \brief CameraText structure used in various functions.
*
* A text structure containing translated text returned
@@ -69,7 +69,7 @@ typedef struct {
char text [32 * 1024]; /**< \brief Character string containing the translated text. */
} CameraText;
-/**
+/**
* \brief A structure created by the capture operation.
*
* A structure containing the folder and filename of an object
@@ -112,7 +112,7 @@ typedef enum {
/**
* \name Camera object member functions
*
- * These functions must be implemented by a camlib and the camlib's
+ * These functions must be implemented by a camlib and the camlib's
* camera_init() function will add them to a Camera object.
*
* @{
@@ -133,7 +133,7 @@ typedef enum {
* Implement this function if you need to any of this stuff, otherwise leave
* it out.
*
- * \returns a gphoto error code
+ * \returns a gphoto error code
*/
typedef int (*CameraExitFunc) (Camera *camera, GPContext *context);
@@ -172,7 +172,7 @@ typedef int (*CameraGetConfigFunc) (Camera *camera, CameraWidget **widget,
* frontend, which then renders it, allows user input and sends it back
* via the #CameraSetConfigFunc function to have the driver configure itself
* or the camera.
- *
+ *
* This specific function retrieves one specific named entry, and not the full
* tree to allow for querying specific settings faster.
*
@@ -196,7 +196,7 @@ typedef int (*CameraGetSingleConfigFunc) (Camera *camera, const char *name, Came
* frontend, which then renders it, allows user input and sends it back
* via the #CameraSetConfigFunc function to have the driver configure itself
* or the camera.
- *
+ *
* This specific function retrieves all the available configuration values in a flat list.
*
* This is different than the GetConfigFunc, which returns a configuration tree.
@@ -210,14 +210,14 @@ typedef int (*CameraListConfigFunc) (Camera *camera, CameraList *list, GPContext
/**
* \brief Set the configuration in the camera
*
- * \param camera the current camera
+ * \param camera the current camera
* \param widget the configuration widget tree that was changed
* \param context the active #GPContext
*
* This function is called in the driver after the configuration is set.
* It is called directly after setting the value and might called multiple
* times (or never) after just one #CameraGetConfigFunc.
- *
+ *
* \returns a gphoto error code
*/
typedef int (*CameraSetConfigFunc) (Camera *camera, CameraWidget *widget,
@@ -225,13 +225,13 @@ typedef int (*CameraSetConfigFunc) (Camera *camera, CameraWidget *widget,
/**
* \brief Set a single configuration variable in the camera
*
- * \param camera the current camera
+ * \param camera the current camera
* \param name the widget to set
* \param widget the configuration widget tree that was changed
* \param context the active #GPContext
*
* This function is called in the driver after the configuration value is set.
- *
+ *
* \returns a gphoto error code
*/
typedef int (*CameraSetSingleConfigFunc) (Camera *camera, const char *name, CameraWidget *widget,
@@ -263,8 +263,8 @@ typedef int (*CameraWaitForEvent) (Camera *camera, int timeout,
* be initialized before or reset the after each access from
* libgphoto2.
*
- * For example, you would probably set the speed to the highest one
- * right before downloading an image, and reset it to the default speed
+ * For example, you would probably set the speed to the highest one
+ * right before downloading an image, and reset it to the default speed
* afterwards so that other programs will not be affected by this speed
* change.
*/
@@ -340,7 +340,7 @@ struct _Camera {
int gp_camera_new (Camera **camera);
-/** \name Preparing initialization
+/** \name Preparing initialization
* @{
*/
int gp_camera_set_abilities (Camera *camera, CameraAbilities abilities);
@@ -365,19 +365,19 @@ int gp_camera_get_port_speed (Camera *camera);
/**@}*/
-/** \name Initialization
- * @{
+/** \name Initialization
+ * @{
*/
int gp_camera_autodetect (CameraList *list, GPContext *context);
int gp_camera_init (Camera *camera, GPContext *context);
int gp_camera_exit (Camera *camera, GPContext *context);
/**@}*/
-
-/** \name Operations on cameras
- * @{
+
+/** \name Operations on cameras
+ * @{
*/
int gp_camera_ref (Camera *camera);
int gp_camera_unref (Camera *camera);
@@ -414,12 +414,12 @@ int gp_camera_get_storageinfo (Camera *camera, CameraStorageInformation**,
/**@}*/
-/** \name Operations on folders
+/** \name Operations on folders
* @{
*/
-int gp_camera_folder_list_files (Camera *camera, const char *folder,
+int gp_camera_folder_list_files (Camera *camera, const char *folder,
CameraList *list, GPContext *context);
-int gp_camera_folder_list_folders (Camera *camera, const char *folder,
+int gp_camera_folder_list_folders (Camera *camera, const char *folder,
CameraList *list, GPContext *context);
int gp_camera_folder_delete_all (Camera *camera, const char *folder,
GPContext *context);
@@ -434,29 +434,29 @@ int gp_camera_folder_remove_dir (Camera *camera, const char *folder,
/**@}*/
-/** \name Operations on files
+/** \name Operations on files
* @{
*/
-int gp_camera_file_get_info (Camera *camera, const char *folder,
+int gp_camera_file_get_info (Camera *camera, const char *folder,
const char *file, CameraFileInfo *info,
GPContext *context);
-int gp_camera_file_set_info (Camera *camera, const char *folder,
+int gp_camera_file_set_info (Camera *camera, const char *folder,
const char *file, CameraFileInfo info,
GPContext *context);
-int gp_camera_file_get (Camera *camera, const char *folder,
+int gp_camera_file_get (Camera *camera, const char *folder,
const char *file, CameraFileType type,
CameraFile *camera_file, GPContext *context);
int gp_camera_file_read (Camera *camera, const char *folder, const char *file,
- CameraFileType type,
+ CameraFileType type,
uint64_t offset, char *buf, uint64_t *size,
GPContext *context);
-int gp_camera_file_delete (Camera *camera, const char *folder,
+int gp_camera_file_delete (Camera *camera, const char *folder,
const char *file, GPContext *context);
/**@}*/
/**
- * \name Some cameras need 'keep-alive-messages'.
+ * \name Some cameras need 'keep-alive-messages'.
* @{
*/
typedef int (* CameraTimeoutFunc) (Camera *camera,
diff --git a/gphoto2/gphoto2-context.h b/gphoto2/gphoto2-context.h
index 37fba15c1..3a3d13098 100644
--- a/gphoto2/gphoto2-context.h
+++ b/gphoto2/gphoto2-context.h
@@ -1,4 +1,4 @@
-/** \file
+/** \file
* \brief Context callback operation functions.
*
* \author Copyright 2001 Lutz Mueller <lutz@users.sourceforge.net>
@@ -10,10 +10,10 @@
* version 2 of the License, or (at your option) any later version.
*
* \note
- * 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.
*
* \note
* You should have received a copy of the GNU Lesser General Public
@@ -34,7 +34,7 @@ extern "C" {
/**
* \brief The gphoto context structure.
*
- * This structure allows callback handling, passing error contexts back,
+ * This structure allows callback handling, passing error contexts back,
* progress handling and download cancellation and similar things.
* It is usually passed around the functions.
*/
diff --git a/gphoto2/gphoto2-file.h b/gphoto2/gphoto2-file.h
index 1fb50d7a9..5cf19c77a 100644
--- a/gphoto2/gphoto2-file.h
+++ b/gphoto2/gphoto2-file.h
@@ -11,10 +11,10 @@
* version 2 of the License, or (at your option) any later version.
*
* \note
- * 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.
*
* \note
* You should have received a copy of the GNU Lesser General Public
diff --git a/gphoto2/gphoto2-filesys.h b/gphoto2/gphoto2-filesys.h
index 828cd179d..d8bceaf12 100644
--- a/gphoto2/gphoto2-filesys.h
+++ b/gphoto2/gphoto2-filesys.h
@@ -15,10 +15,10 @@
* version 2 of the License, or (at your option) any later version.
*
* \note
- * 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.
*
* \note
* You should have received a copy of the GNU Lesser General Public
@@ -41,12 +41,12 @@
extern "C" {
#endif /* __cplusplus */
-/**
+/**
* \brief Bitmask on what fields are set in the CameraFileInfo structure.
*
* Bitmask to mark up which fields are set in the CameraFileInfo
* structure. The other fields might be uninitialized.
- * If you set information via gp_camera_file_set_info() you
+ * If you set information via gp_camera_file_set_info() you
* need to set those flags. If you retrieve information via
* gp_camera_file_get_info() you need to check those flags.
* They are separate for both "normal" and "preview" parts
@@ -132,7 +132,7 @@ typedef struct _CameraFileInfoAudio {
char type[64]; /**< \brief MIME type of the audio file. */
} CameraFileInfoAudio;
-/**
+/**
* \brief File information structure.
*
* Contains the normal, preview and audio file information structures
@@ -144,14 +144,14 @@ typedef struct _CameraFileInfo {
CameraFileInfoAudio audio;
} CameraFileInfo;
-/**
+/**
* \brief Storage information flags.
*
* Bitmask to specify which entries of the filesystem
* storage information is set.
*/
typedef enum {
- GP_STORAGEINFO_BASE = (1<<0), /**< \brief The base directory.
+ GP_STORAGEINFO_BASE = (1<<0), /**< \brief The base directory.
* Usually / if just 1 storage is attached.
*/
GP_STORAGEINFO_LABEL = (1<<1), /**< \brief Label of the filesystem.
@@ -168,7 +168,7 @@ typedef enum {
/**
* \brief Hardware storage types.
- *
+ *
* Type of hardware this storage is on. The types and values
* are the same as the PTP standard uses (PTP_ST_xxx).
*/
@@ -182,7 +182,7 @@ typedef enum {
/**
* \brief Storage access modes.
- *
+ *
* The modes we can access the storage with. Uses the same
* types and values as the PTP standard (PTP_AC_xxx).
*/
@@ -194,7 +194,7 @@ typedef enum {
/**
* \brief Filesystem hierarchy types.
- *
+ *
* The type of the filesystem hierarchy the devices uses.
* Same types and values as the PTP standard defines (PTP_FST_xxx).
*/
@@ -224,7 +224,7 @@ typedef struct _CameraStorageInformation {
uint64_t freeimages; /**< \brief Free space in images (guessed by camera). */
} CameraStorageInformation;
-/**
+/**
* \brief Filesystem structure, only exposed to camera drivers.
*
* Internal structure, contents not exposed to frontends. Camera
diff --git a/gphoto2/gphoto2-library.h b/gphoto2/gphoto2-library.h
index 5009238c8..b0f8c530f 100644
--- a/gphoto2/gphoto2-library.h
+++ b/gphoto2/gphoto2-library.h
@@ -1,6 +1,6 @@
/** \file
* \brief Camery driver header.
- *
+ *
* \author Copyright 2000 Scott Fritzinger
*
* \note
@@ -10,10 +10,10 @@
* version 2 of the License, or (at your option) any later version.
*
* \note
- * 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.
*
* \note
* You should have received a copy of the GNU Lesser General Public
@@ -58,14 +58,14 @@ typedef int (* CameraLibraryAbilitiesFunc) (CameraAbilitiesList *list);
* \return a gphoto2 error code
*
* The camera driver will establish a first connection
- * to the camera and configure the camera variable (i.e. using
+ * to the camera and configure the camera variable (i.e. using
* #gp_filesystem_set_list_funcs or #gp_port_get_settings).
*
**/
typedef int (* CameraLibraryInitFunc) (Camera *camera, GPContext *context);
/*
- * If you want to write a camera library, you need to implement
+ * If you want to write a camera library, you need to implement
* the following three functions. Everything else should be declared
* as static.
*/
diff --git a/gphoto2/gphoto2-list.h b/gphoto2/gphoto2-list.h
index 7dc6f9506..70944d7ef 100644
--- a/gphoto2/gphoto2-list.h
+++ b/gphoto2/gphoto2-list.h
@@ -11,10 +11,10 @@
* version 2 of the License, or (at your option) any later version.
*
* \note
- * 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.
*
* \note
* You should have received a copy of the GNU Lesser General Public
@@ -30,13 +30,13 @@
extern "C" {
#endif /* __cplusplus */
-/**
+/**
* \brief A generic list
- *
+ *
* This structure provides a list with \a name:value pairs that is used in various
* parts of libgphoto2. Its details are internal, please use the
* gp_list_xxx accessor functions.
- *
+ *
* Usage pattern for CameraList for users external of
* libgphoto2, such as libgphoto2 frontends:
*
@@ -57,7 +57,7 @@ extern "C" {
* \code
* CameraList foo; // DO NOT DO THIS
* \endcode
- *
+ *
* Please do NOT directly access the structure members like this:
* \code
* list->entry[i].name // DO NOT DO THIS
diff --git a/gphoto2/gphoto2-result.h b/gphoto2/gphoto2-result.h
index 79b953849..87b8b4c7c 100644
--- a/gphoto2/gphoto2-result.h
+++ b/gphoto2/gphoto2-result.h
@@ -9,10 +9,10 @@
* version 2 of the License, or (at your option) any later version.
*
* \note
- * 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.
*
* \note
* You should have received a copy of the GNU Lesser General Public
@@ -53,7 +53,7 @@ extern "C" {
* \brief Specified camera model was not found
*
* The specified model could not be found. This error is reported when
- * the user specified a model that does not seem to be supported by
+ * the user specified a model that does not seem to be supported by
* any driver.
**/
#define GP_ERROR_MODEL_NOT_FOUND -105
@@ -77,13 +77,13 @@ extern "C" {
/**
* \brief Specified directory already exists
*
- * The specified directory already exists. This error is reported for example
+ * The specified directory already exists. This error is reported for example
* when the user wants to create a directory that already exists.
**/
#define GP_ERROR_DIRECTORY_EXISTS -109
/**
- * \brief The camera is already busy
+ * \brief The camera is already busy
*
* Camera I/O or a command is in progress.
**/
@@ -91,7 +91,7 @@ extern "C" {
/**
* \brief Path is not absolute
- *
+ *
* The specified path is not absolute. This error is reported when the user
* specifies paths that are not absolute, i.e. paths like "path/to/directory".
* As a rule of thumb, in gphoto2, there is nothing like relative paths.
diff --git a/gphoto2/gphoto2-setting.h b/gphoto2/gphoto2-setting.h
index 15a74a878..697cea91e 100644
--- a/gphoto2/gphoto2-setting.h
+++ b/gphoto2/gphoto2-setting.h
@@ -9,10 +9,10 @@
* version 2 of the License, or (at your option) any later version.
*
* \note
- * 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.
*
* \note
* You should have received a copy of the GNU Lesser General Public
diff --git a/gphoto2/gphoto2-version.h b/gphoto2/gphoto2-version.h
index 0de10a26a..a25fc094a 100644
--- a/gphoto2/gphoto2-version.h
+++ b/gphoto2/gphoto2-version.h
@@ -9,10 +9,10 @@
* version 2 of the License, or (at your option) any later version.
*
* \note
- * 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.
*
* \note
* You should have received a copy of the GNU Lesser General Public
diff --git a/gphoto2/gphoto2-widget.h b/gphoto2/gphoto2-widget.h
index 126f7e251..d33437cbb 100644
--- a/gphoto2/gphoto2-widget.h
+++ b/gphoto2/gphoto2-widget.h
@@ -9,10 +9,10 @@
* version 2 of the License, or (at your option) any later version.
*
* \note
- * 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.
*
* \note
* You should have received a copy of the GNU Lesser General Public
@@ -70,7 +70,7 @@ typedef enum { /* Value (get/set): */
*/
typedef int (* CameraWidgetCallback) (Camera *, CameraWidget *, GPContext *);
-int gp_widget_new (CameraWidgetType type, const char *label,
+int gp_widget_new (CameraWidgetType type, const char *label,
CameraWidget **widget);
int gp_widget_free (CameraWidget *widget);
int gp_widget_ref (CameraWidget *widget);
@@ -80,14 +80,14 @@ int gp_widget_append (CameraWidget *widget, CameraWidget *child);
int gp_widget_prepend (CameraWidget *widget, CameraWidget *child);
int gp_widget_count_children (CameraWidget *widget);
-int gp_widget_get_child (CameraWidget *widget, int child_number,
+int gp_widget_get_child (CameraWidget *widget, int child_number,
CameraWidget **child);
/* Retrieve Widgets */
int gp_widget_get_child_by_label (CameraWidget *widget,
const char *label,
CameraWidget **child);
-int gp_widget_get_child_by_id (CameraWidget *widget, int id,
+int gp_widget_get_child_by_id (CameraWidget *widget, int id,
CameraWidget **child);
int gp_widget_get_child_by_name (CameraWidget *widget,
const char *name,
@@ -110,14 +110,14 @@ int gp_widget_get_id (CameraWidget *widget, int *id);
int gp_widget_get_type (CameraWidget *widget, CameraWidgetType *type);
int gp_widget_get_label (CameraWidget *widget, const char **label);
-int gp_widget_set_range (CameraWidget *range,
+int gp_widget_set_range (CameraWidget *range,
float low, float high, float increment);
-int gp_widget_get_range (CameraWidget *range,
+int gp_widget_get_range (CameraWidget *range,
float *min, float *max, float *increment);
int gp_widget_add_choice (CameraWidget *widget, const char *choice);
int gp_widget_count_choices (CameraWidget *widget);
-int gp_widget_get_choice (CameraWidget *widget, int choice_number,
+int gp_widget_get_choice (CameraWidget *widget, int choice_number,
const char **choice);
int gp_widget_changed (CameraWidget *widget);
diff --git a/gphoto2/gphoto2.h b/gphoto2/gphoto2.h
index ac95a835a..9bb6ba970 100644
--- a/gphoto2/gphoto2.h
+++ b/gphoto2/gphoto2.h
@@ -10,10 +10,10 @@
* version 2 of the License, or (at your option) any later version.
*
* \note
- * 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.
*
* \note
* You should have received a copy of the GNU Lesser General Public