Change the order of the functions

The USB matching functions have been moved to the top so that all the
string based matching functions are grouped together.

Author: jefdriesen

src/descriptor.c

@@ -506,39 +506,39 @@ static const dc_descriptor_t g_descriptors[] = {
 };
 
 static int
-dc_match_name (const void *key, const void *value)
+dc_match_usb (const void *key, const void *value)
 {
-	const char *k = (const char *) key;
-	const char *v = *(const char * const *) value;
+	const dc_usb_desc_t *k = (const dc_usb_desc_t *) key;
+	const dc_usb_desc_t *v = (const dc_usb_desc_t *) value;
 
-	return strcasecmp (k, v) == 0;
+	return k->vid == v->vid && k->pid == v->pid;
 }
 
 static int
-dc_match_prefix (const void *key, const void *value)
+dc_match_usbhid (const void *key, const void *value)
 {
-	const char *k = (const char *) key;
-	const char *v = *(const char * const *) value;
+	const dc_usbhid_desc_t *k = (const dc_usbhid_desc_t *) key;
+	const dc_usbhid_desc_t *v = (const dc_usbhid_desc_t *) value;
 
-	return strncasecmp (k, v, strlen (v)) == 0;
+	return k->vid == v->vid && k->pid == v->pid;
 }
 
 static int
-dc_match_usb (const void *key, const void *value)
+dc_match_name (const void *key, const void *value)
 {
-	const dc_usb_desc_t *k = (const dc_usb_desc_t *) key;
-	const dc_usb_desc_t *v = (const dc_usb_desc_t *) value;
+	const char *k = (const char *) key;
+	const char *v = *(const char * const *) value;
 
-	return k->vid == v->vid && k->pid == v->pid;
+	return strcasecmp (k, v) == 0;
 }
 
 static int
-dc_match_usbhid (const void *key, const void *value)
+dc_match_prefix (const void *key, const void *value)
 {
-	const dc_usbhid_desc_t *k = (const dc_usbhid_desc_t *) key;
-	const dc_usbhid_desc_t *v = (const dc_usbhid_desc_t *) value;
+	const char *k = (const char *) key;
+	const char *v = *(const char * const *) value;
 
-	return k->vid == v->vid && k->pid == v->pid;
+	return strncasecmp (k, v, strlen (v)) == 0;
 }
 
 static int