Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions libwacom/libwacom.h
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ typedef struct _WacomDeviceDatabase WacomDeviceDatabase;
* @ingroup context
*/
enum WacomErrorCode {
WERROR_NONE, /**< No error has occured */
WERROR_NONE, /**< No error has occurred */
WERROR_BAD_ALLOC, /**< Allocation error */
WERROR_INVALID_PATH, /**< A path specified is invalid */
WERROR_INVALID_DB, /**< The passed DB is invalid */
Expand Down Expand Up @@ -464,7 +464,7 @@ libwacom_new_from_builder(const WacomDeviceDatabase *db,
* @param fallback Whether we should create a generic if model is unknown
* @param error If not NULL, set to the error if any occurs
*
* @return A new reference to this device or NULL on errror.
* @return A new reference to this device or NULL on error.
*
* @ingroup devices
*/
Expand All @@ -487,7 +487,7 @@ libwacom_new_from_path(const WacomDeviceDatabase *db,
* @param product_id The product ID of the device
* @param error If not NULL, set to the error if any occurs
*
* @return A new reference to this device or NULL on errror.
* @return A new reference to this device or NULL on error.
*
* @ingroup devices
*/
Expand Down
3 changes: 1 addition & 2 deletions test/test-dbverify.c
Original file line number Diff line number Diff line change
Expand Up @@ -164,13 +164,12 @@ duplicate_database(WacomDeviceDatabase *db,
const char *dirname)
{
WacomDevice **device, **devices;
int i;

devices = libwacom_list_devices_from_database(db, NULL);
g_assert(devices);
g_assert(*devices);

for (device = devices, i = 0; *device; device++, i++) {
for (device = devices; *device; device++) {
int i;
int fd;
g_autofree char *path = NULL;
Expand Down
Loading