-char **parse_probestring(int max_probes, const char *probestring);
-char **sr_parse_triggerstring(struct sr_dev *dev, const char *triggerstring);
-GHashTable *parse_generic_arg(const char *arg);
+GSList *parse_probestring(struct sr_dev_inst *sdi, const char *probestring);
+GHashTable *parse_generic_arg(const char *arg, gboolean sep_first);