summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Meissner <meissner@suse.de>2019-03-25 07:03:20 +0100
committerGitHub <noreply@github.com>2019-03-25 07:03:20 +0100
commit94d059cdec15c4dee63d45d053e6b199f7fdc68b (patch)
treed86db77d03feabc04cff59fc1629cc212e394244
parent02b8b606b65f7416b71fe712e854d68b984b9cb3 (diff)
parente1cfa54be12cd3e4944535dbb0166ad2b2e8029d (diff)
downloadlibmtp-94d059cdec15c4dee63d45d053e6b199f7fdc68b.tar.gz
Merge pull request #22 from daissi/typo
Fix typos detected by the Debian tool lintian
-rw-r--r--ChangeLog4
-rw-r--r--README2
-rw-r--r--src/device-flags.h4
-rw-r--r--src/libmtp.c12
-rw-r--r--src/libmtp.h.in2
-rw-r--r--src/libopenusb1-glue.c4
-rw-r--r--src/libusb-glue.c4
-rw-r--r--src/libusb1-glue.c4
-rw-r--r--src/ptp.c2
-rw-r--r--src/unicode.c4
10 files changed, 21 insertions, 21 deletions
diff --git a/ChangeLog b/ChangeLog
index 3619938..b1fd6a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -615,7 +615,7 @@
2008-11-25 Linus Walleij <triad@df.lth.se>
* src/libmtp.c: fix a bug on handling folder children with an illegal
- ID of 0. Occured in the ZEN Xi-Fi in the "Recordings" folder, when
+ ID of 0. Occurred in the ZEN Xi-Fi in the "Recordings" folder, when
that is created on the device.
2008-11-17 Alistair Boyle <alistair.js.boyle@gmail.com>
@@ -2650,7 +2650,7 @@
2006-08-19 Linus Walleij <triad@df.lth.se>
- * src/libmtp.h.in: add function to get syncronization
+ * src/libmtp.h.in: add function to get synchronization
partner for the device.
* src/libmtp.c: dito.
* examples/detect.c: use that function.
diff --git a/README b/README
index 6fe143e..bbb3c1a 100644
--- a/README
+++ b/README
@@ -275,7 +275,7 @@ cannot test your solution.
* Zen models AVI file seeking problem: the Zens cannot parse the
files for the runlength metadata. Do not transfer file with e.g.
mtp-sendfile, use mtp-sendtr and set the length of the track to
- the apropriate number of seconds and it will work. In graphical
+ the appropriate number of seconds and it will work. In graphical
clients, use a "track transfer" function to send these AVI files,
the Zens need the metadata associated with tracks to play back
movies properly. Movies are considered "tracks" in the MTP world.
diff --git a/src/device-flags.h b/src/device-flags.h
index ced4985..c25536c 100644
--- a/src/device-flags.h
+++ b/src/device-flags.h
@@ -171,7 +171,7 @@
*/
#define DEVICE_FLAG_ALWAYS_PROBE_DESCRIPTOR 0x00000800
/**
- * Samsung has implimented its own playlist format as a .spl file
+ * Samsung has implemented its own playlist format as a .spl file
* stored in the normal file system, rather than a proper mtp
* playlist. There are multiple versions of the .spl format
* identified by a line in the file: VERSION X.XX
@@ -179,7 +179,7 @@
*/
#define DEVICE_FLAG_PLAYLIST_SPL_V1 0x00001000
/**
- * Samsung has implimented its own playlist format as a .spl file
+ * Samsung has implemented its own playlist format as a .spl file
* stored in the normal file system, rather than a proper mtp
* playlist. There are multiple versions of the .spl format
* identified by a line in the file: VERSION X.XX
diff --git a/src/libmtp.c b/src/libmtp.c
index 30ca9ac..910f081 100644
--- a/src/libmtp.c
+++ b/src/libmtp.c
@@ -3708,7 +3708,7 @@ int LIBMTP_Set_Friendlyname(LIBMTP_mtpdevice_t *device,
}
/**
- * This retrieves the syncronization partner of an MTP device. This
+ * This retrieves the synchronization partner of an MTP device. This
* property should be supported by all MTP devices.
* @param device a pointer to the device to get the sync partner for.
* @return a newly allocated UTF-8 string representing the synchronization
@@ -3972,7 +3972,7 @@ int LIBMTP_Get_Device_Certificate(LIBMTP_mtpdevice_t *device, char ** const devc
* This function retrieves a list of supported file types, i.e. the file
* types that this device claims it supports, e.g. audio file types that
* the device can play etc. This list is mitigated to
- * inlcude the file types that libmtp can handle, i.e. it will not list
+ * include the file types that libmtp can handle, i.e. it will not list
* filetypes that libmtp will handle internally like playlists and folders.
* @param device a pointer to the device to get the filetype capabilities for.
* @param filetypes a pointer to a pointer that will hold the list of
@@ -4083,7 +4083,7 @@ int LIBMTP_Check_Capability(LIBMTP_mtpdevice_t *device, LIBMTP_devicecap_t cap)
* this function, then dereference the device struct
* (<code>device-&gt;storage</code>) to get out information on the storage.
*
- * You need to call this everytime you want to update the
+ * You need to call this every time you want to update the
* <code>device-&gt;storage</code> list, for example anytime you need
* to check available storage somewhere.
*
@@ -7430,7 +7430,7 @@ LIBMTP_folder_t *LIBMTP_Get_Folder_List(LIBMTP_mtpdevice_t *device)
* notice that you cannot mismatch storage id and parent id:
* they must both be on the same storage! Pass in 0 if you
* want to create this folder on the default storage.
- * @return id to new folder or 0 if an error occured
+ * @return id to new folder or 0 if an error occurred
*/
uint32_t LIBMTP_Create_Folder(LIBMTP_mtpdevice_t *device, char *name,
uint32_t parent_id, uint32_t storage_id)
@@ -8321,7 +8321,7 @@ int LIBMTP_Create_New_Playlist(LIBMTP_mtpdevice_t *device,
* @param device a pointer to the device to create the new playlist on.
* @param metadata the metadata for the playlist to be updated.
* notice that the field <code>playlist_id</code>
- * must contain the apropriate playlist ID. Playlist ID
+ * must contain the appropriate playlist ID. Playlist ID
* be modified to a new playlist ID by the time the
* function returns since edit-in-place is not always possible.
* @return 0 on success, any other value means failure.
@@ -9213,7 +9213,7 @@ int LIBMTP_TruncateObject(LIBMTP_mtpdevice_t *device, uint32_t const id,
* @param device a pointer to the device to create the new album on.
* @param metadata the metadata for the album to be updated.
* notice that the field <code>album_id</code>
- * must contain the apropriate album ID.
+ * must contain the appropriate album ID.
* @return 0 on success, any other value means failure.
* @see LIBMTP_Create_New_Album()
* @see LIBMTP_Delete_Object()
diff --git a/src/libmtp.h.in b/src/libmtp.h.in
index 89d39d9..d89a52c 100644
--- a/src/libmtp.h.in
+++ b/src/libmtp.h.in
@@ -409,7 +409,7 @@ typedef enum {
*/
typedef enum {
/**
- * This capability tells whether you can call the funcion getting
+ * This capability tells whether you can call the function getting
* partial objects, @see LIBMTP_GetPartialObject()
*/
LIBMTP_DEVICECAP_GetPartialObject,
diff --git a/src/libopenusb1-glue.c b/src/libopenusb1-glue.c
index c2e8dd5..294c427 100644
--- a/src/libopenusb1-glue.c
+++ b/src/libopenusb1-glue.c
@@ -125,7 +125,7 @@ static openusb_handle_t libmtp_openusb_handle;
* successful.
* @param numdevs a pointer to an integer that will hold the number
* of devices in the device list if the call was successful.
- * @return 0 if the list was successfull retrieved, any other
+ * @return 0 if the list was successful retrieved, any other
* value means failure.
*/
int LIBMTP_Get_Supported_Devices_List(LIBMTP_device_entry_t * * const devices, int * const numdevs) {
@@ -706,7 +706,7 @@ void dump_usbinfo(PTP_USB *ptp_usb) {
}
/**
- * Retrieve the apropriate playlist extension for this
+ * Retrieve the appropriate playlist extension for this
* device. Rather hacky at the moment. This is probably
* desired by the managing software, but when creating
* lists on the device itself you notice certain preferences.
diff --git a/src/libusb-glue.c b/src/libusb-glue.c
index b0f8ee2..5e84b1d 100644
--- a/src/libusb-glue.c
+++ b/src/libusb-glue.c
@@ -130,7 +130,7 @@ static int usb_get_endpoint_status(PTP_USB* ptp_usb, int ep, uint16_t* status);
* successful.
* @param numdevs a pointer to an integer that will hold the number
* of devices in the device list if the call was successful.
- * @return 0 if the list was successfull retrieved, any other
+ * @return 0 if the list was successful retrieved, any other
* value means failure.
*/
int LIBMTP_Get_Supported_Devices_List(LIBMTP_device_entry_t ** const devices, int * const numdevs)
@@ -733,7 +733,7 @@ void dump_usbinfo(PTP_USB *ptp_usb)
}
/**
- * Retrieve the apropriate playlist extension for this
+ * Retrieve the appropriate playlist extension for this
* device. Rather hacky at the moment. This is probably
* desired by the managing software, but when creating
* lists on the device itself you notice certain preferences.
diff --git a/src/libusb1-glue.c b/src/libusb1-glue.c
index a601fce..67ba277 100644
--- a/src/libusb1-glue.c
+++ b/src/libusb1-glue.c
@@ -130,7 +130,7 @@ static int usb_get_endpoint_status(PTP_USB* ptp_usb,
* successful.
* @param numdevs a pointer to an integer that will hold the number
* of devices in the device list if the call was successful.
- * @return 0 if the list was successfull retrieved, any other
+ * @return 0 if the list was successful retrieved, any other
* value means failure.
*/
int LIBMTP_Get_Supported_Devices_List(LIBMTP_device_entry_t ** const devices,
@@ -751,7 +751,7 @@ void dump_usbinfo(PTP_USB *ptp_usb)
}
/**
- * Retrieve the apropriate playlist extension for this
+ * Retrieve the appropriate playlist extension for this
* device. Rather hacky at the moment. This is probably
* desired by the managing software, but when creating
* lists on the device itself you notice certain preferences.
diff --git a/src/ptp.c b/src/ptp.c
index 534def2..2c0eae6 100644
--- a/src/ptp.c
+++ b/src/ptp.c
@@ -2461,7 +2461,7 @@ ptp_canon_checkevent (PTPParams* params, PTPContainer* event, int* isevent)
PTP_CNT_INIT(ptp, PTP_OC_CANON_CheckEvent);
*isevent=0;
CHECK_PTP_RC(ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, &data, &size));
- if (data && size) { /* check if we had a successfull call with data */
+ if (data && size) { /* check if we had a successful call with data */
ptp_unpack_EC(params, data, event, size);
*isevent=1;
free(data);
diff --git a/src/unicode.c b/src/unicode.c
index 89c2cbe..2adc94e 100644
--- a/src/unicode.c
+++ b/src/unicode.c
@@ -145,7 +145,7 @@ uint16_t *utf8_to_utf16(LIBMTP_mtpdevice_t *device, const char *localstr)
/**
* This helper function simply removes any consecutive chars
* > 0x7F and replace then with an underscore. In UTF-8
- * consequtive chars > 0x7F represent one single character so
+ * consecutive chars > 0x7F represent one single character so
* it has to be done like this (and it's elegant). It will only
* shrink the string in size so no copying is needed.
*/
@@ -159,7 +159,7 @@ void strip_7bit_from_utf8(char *str)
if ((uint8_t) str[i] > 0x7FU) {
str[j] = '_';
i++;
- // Skip over any consequtive > 0x7F chars.
+ // Skip over any consecutive > 0x7F chars.
while((uint8_t) str[i] > 0x7FU) {
i++;
}