X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fdevice.c;h=9dd2201e528b05a0848a4cf0e34135dd7232fde9;hb=c7bc82ffa1b09a228a8395049e2b691cd7bd85f8;hp=fb40182c13b6404a773fe0814520fe0092f64823;hpb=e705ce3bf6203b03efd66390b02c2352c62229bc;p=libsigrok.git

diff --git a/src/device.c b/src/device.c
index fb40182c..9dd2201e 100644
--- a/src/device.c
+++ b/src/device.c
@@ -48,18 +48,14 @@
  *  @param[in]  enabled @copydoc sr_channel::enabled
  *  @param[in]  name @copydoc sr_channel::name
  *
- *  @return NULL (failure) or new struct sr_channel*.
+ *  @return A new struct sr_channel*.
  */
 SR_PRIV struct sr_channel *sr_channel_new(int index, int type,
 		gboolean enabled, const char *name)
 {
 	struct sr_channel *ch;
 
-	if (!(ch = g_try_malloc0(sizeof(struct sr_channel)))) {
-		sr_err("Channel malloc failed.");
-		return NULL;
-	}
-
+	ch = g_malloc0(sizeof(struct sr_channel));
 	ch->index = index;
 	ch->type = type;
 	ch->enabled = enabled;
@@ -201,57 +197,26 @@ SR_API gboolean sr_dev_has_option(const struct sr_dev_inst *sdi, int key)
 	return ret;
 }
 
-/** @private
- *  Allocate and init a new device instance struct.
- *  @param[in]  index   @copydoc sr_dev_inst::index
- *  @param[in]  status  @copydoc sr_dev_inst::status
- *  @param[in]  vendor  @copydoc sr_dev_inst::vendor
- *  @param[in]  model   @copydoc sr_dev_inst::model
- *  @param[in]  version @copydoc sr_dev_inst::version
- *
- *  @retval NULL Error
- *  @retval struct sr_dev_inst *. Dynamically allocated, free using
- *              sr_dev_inst_free().
- */
-SR_PRIV struct sr_dev_inst *sr_dev_inst_new(int status,
-		const char *vendor, const char *model, const char *version)
-{
-	struct sr_dev_inst *sdi;
-
-	if (!(sdi = g_try_malloc(sizeof(struct sr_dev_inst)))) {
-		sr_err("Device instance malloc failed.");
-		return NULL;
-	}
-
-	sdi->driver = NULL;
-	sdi->status = status;
-	sdi->inst_type = -1;
-	sdi->vendor = vendor ? g_strdup(vendor) : NULL;
-	sdi->model = model ? g_strdup(model) : NULL;
-	sdi->version = version ? g_strdup(version) : NULL;
-	sdi->serial_num = NULL;
-	sdi->connection_id = NULL;
-	sdi->channels = NULL;
-	sdi->channel_groups = NULL;
-	sdi->session = NULL;
-	sdi->conn = NULL;
-	sdi->priv = NULL;
-
-	return sdi;
-}
-
 /**
  * Allocate and init a new user-generated device instance.
+ *
+ * @param vendor Device vendor
+ * @param model Device model
+ * @param version Device version
+ *
+ * @retval struct sr_dev_inst *. Dynamically allocated, free using
+ *         sr_dev_inst_free().
  */
 SR_API struct sr_dev_inst *sr_dev_inst_user_new(const char *vendor,
 		const char *model, const char *version)
 {
 	struct sr_dev_inst *sdi;
 
-	sdi = sr_dev_inst_new(0, vendor, model, version);
-	if (!sdi)
-		return NULL;
+	sdi = g_malloc0(sizeof(struct sr_dev_inst));
 
+	sdi->vendor = g_strdup(vendor);
+	sdi->model = g_strdup(model);
+	sdi->version = g_strdup(version);
 	sdi->inst_type = SR_INST_USER;
 
 	return sdi;
@@ -268,9 +233,6 @@ SR_API int sr_dev_inst_channel_add(struct sr_dev_inst *sdi, int index, int type,
 		return SR_ERR_ARG;
 
 	ch = sr_channel_new(index, type, TRUE, name);
-	if (!ch)
-		return SR_ERR;
-
 	sdi->channels = g_slist_append(sdi->channels, ch);
 
 	return SR_OK;
@@ -319,7 +281,6 @@ SR_PRIV void sr_dev_inst_free(struct sr_dev_inst *sdi)
  *  @param[in]  address @copydoc sr_usb_dev_inst::address
  *  @param[in]  hdl @copydoc sr_usb_dev_inst::devhdl
  *
- *  @retval NULL Error
  *  @retval other struct sr_usb_dev_inst * for USB device instance.
  */
 SR_PRIV struct sr_usb_dev_inst *sr_usb_dev_inst_new(uint8_t bus,
@@ -327,11 +288,7 @@ SR_PRIV struct sr_usb_dev_inst *sr_usb_dev_inst_new(uint8_t bus,
 {
 	struct sr_usb_dev_inst *udi;
 
-	if (!(udi = g_try_malloc(sizeof(struct sr_usb_dev_inst)))) {
-		sr_err("USB device instance malloc failed.");
-		return NULL;
-	}
-
+	udi = g_malloc0(sizeof(struct sr_usb_dev_inst));
 	udi->bus = bus;
 	udi->address = address;
 	udi->devhdl = hdl;
@@ -360,10 +317,11 @@ SR_PRIV void sr_usb_dev_inst_free(struct sr_usb_dev_inst *usb)
  *
  * @param[in] port OS-specific serial port specification. Examples:
  *                 "/dev/ttyUSB0", "/dev/ttyACM1", "/dev/tty.Modem-0", "COM1".
+ *                 Must not be NULL.
  * @param[in] serialcomm A serial communication parameters string, in the form
  *              of \<speed\>/\<data bits\>\<parity\>\<stopbits\>, for example
  *              "9600/8n1" or "600/7o2". This is an optional parameter;
- *              it may be filled in later.
+ *              it may be filled in later. Can be NULL.
  *
  * @return A pointer to a newly initialized struct sr_serial_dev_inst,
  *         or NULL on error.
@@ -373,16 +331,7 @@ SR_PRIV struct sr_serial_dev_inst *sr_serial_dev_inst_new(const char *port,
 {
 	struct sr_serial_dev_inst *serial;
 
-	if (!port) {
-		sr_err("Serial port required.");
-		return NULL;
-	}
-
-	if (!(serial = g_try_malloc0(sizeof(struct sr_serial_dev_inst)))) {
-		sr_err("Serial device instance malloc failed.");
-		return NULL;
-	}
-
+	serial = g_malloc0(sizeof(struct sr_serial_dev_inst));
 	serial->port = g_strdup(port);
 	if (serialcomm)
 		serial->serialcomm = g_strdup(serialcomm);
@@ -407,16 +356,7 @@ SR_PRIV struct sr_usbtmc_dev_inst *sr_usbtmc_dev_inst_new(const char *device)
 {
 	struct sr_usbtmc_dev_inst *usbtmc;
 
-	if (!device) {
-		sr_err("Device name required.");
-		return NULL;
-	}
-
-	if (!(usbtmc = g_try_malloc0(sizeof(struct sr_usbtmc_dev_inst)))) {
-		sr_err("USBTMC device instance malloc failed.");
-		return NULL;
-	}
-
+	usbtmc = g_malloc0(sizeof(struct sr_usbtmc_dev_inst));
 	usbtmc->device = g_strdup(device);
 	usbtmc->fd = -1;