Don't allocate cubeb_device on heap

marcin-serwin · marcin-serwin · commit 235fb0e525f6 · 2025-07-31T21:14:25.000+02:00
Signed-off-by: Marcin Serwin &lt;marcin@serwin.dev&gt;
diff --git a/include/cubeb/cubeb.h b/include/cubeb/cubeb.h
@@ -679,7 +679,7 @@ cubeb_stream_set_name(cubeb_stream * stream, char const * stream_name);
     @retval CUBEB_ERROR_NOT_SUPPORTED */
 CUBEB_EXPORT int
 cubeb_stream_get_current_device(cubeb_stream * stm,
-                                cubeb_device ** const device);
+                                cubeb_device * const device);
 
 /** Set input mute state for this stream. Some platforms notify the user when an
     application is accessing audio input. When all inputs are muted they can
diff --git a/src/cubeb-internal.h b/src/cubeb-internal.h
@@ -63,7 +63,7 @@ struct cubeb_ops {
   int (*stream_set_volume)(cubeb_stream * stream, float volumes);
   int (*stream_set_name)(cubeb_stream * stream, char const * stream_name);
   int (*stream_get_current_device)(cubeb_stream * stream,
-                                   cubeb_device ** const device);
+                                   cubeb_device * const device);
   int (*stream_set_input_mute)(cubeb_stream * stream, int mute);
   int (*stream_set_input_processing_params)(
       cubeb_stream * stream, cubeb_input_processing_params params);
diff --git a/src/cubeb.c b/src/cubeb.c
@@ -559,7 +559,7 @@ cubeb_stream_set_name(cubeb_stream * stream, char const * stream_name)
 
 int
 cubeb_stream_get_current_device(cubeb_stream * stream,
-                                cubeb_device ** const device)
+                                cubeb_device * const device)
 {
   if (!stream || !device) {
     return CUBEB_ERROR_INVALID_PARAMETER;
diff --git a/src/cubeb_jack.cpp b/src/cubeb_jack.cpp
@@ -127,7 +127,7 @@ static int
 cbjack_stream_device_destroy(cubeb_stream * stream, cubeb_device * device);
 static int
 cbjack_stream_get_current_device(cubeb_stream * stm,
-                                 cubeb_device ** const device);
+                                 cubeb_device * const device);
 static int
 cbjack_enumerate_devices(cubeb * context, cubeb_device_type type,
                          cubeb_device_collection * collection);
@@ -1075,25 +1075,21 @@ cbjack_stream_set_volume(cubeb_stream * stm, float volume)
 
 static int
 cbjack_stream_get_current_device(cubeb_stream * stm,
-                                 cubeb_device ** const device)
+                                 cubeb_device * const device)
 {
-  *device = (cubeb_device *)calloc(1, sizeof(cubeb_device));
-  if (*device == NULL)
-    return CUBEB_ERROR;
-
   const char * j_in = JACK_DEFAULT_IN;
   const char * j_out = JACK_DEFAULT_OUT;
   const char * empty = "";
 
   if (stm->devs == DUPLEX) {
-    (*device)->input_name = j_in;
-    (*device)->output_name = j_out;
+    device->input_name = j_in;
+    device->output_name = j_out;
   } else if (stm->devs == IN_ONLY) {
-    (*device)->input_name = j_in;
-    (*device)->output_name = empty;
+    device->input_name = j_in;
+    device->output_name = empty;
   } else if (stm->devs == OUT_ONLY) {
-    (*device)->input_name = empty;
-    (*device)->output_name = j_out;
+    device->input_name = empty;
+    device->output_name = j_out;
   }
 
   return CUBEB_OK;
@@ -1102,7 +1098,6 @@ cbjack_stream_get_current_device(cubeb_stream * stm,
 static int
 cbjack_stream_device_destroy(cubeb_stream * /*stream*/, cubeb_device * device)
 {
-  free(device);
   return CUBEB_OK;
 }
 
diff --git a/src/cubeb_oss.c b/src/cubeb_oss.c
@@ -1306,22 +1306,18 @@ oss_stream_set_volume(cubeb_stream * stream, float volume)
 }
 
 static int
-oss_get_current_device(cubeb_stream * stream, cubeb_device ** const device)
+oss_get_current_device(cubeb_stream * stream, cubeb_device * const device)
 {
-  *device = calloc(1, sizeof(cubeb_device));
-  if (*device == NULL) {
-    return CUBEB_ERROR;
-  }
-  (*device)->input_name = stream->record.fd != -1 ? stream->record.name : NULL;
-  (*device)->output_name = stream->play.fd != -1 ? stream->play.name : NULL;
+  device->input_name = stream->record.fd != -1 ? stream->record.name : NULL;
+  device->output_name = stream->play.fd != -1 ? stream->play.name : NULL;
   return CUBEB_OK;
 }
 
 static int
 oss_stream_device_destroy(cubeb_stream * stream, cubeb_device * device)
 {
   (void)stream;
-  free(device);
+  (void)device;
   return CUBEB_OK;
 }
 
diff --git a/src/cubeb_pulse.c b/src/cubeb_pulse.c
@@ -1526,21 +1526,15 @@ pulse_device_collection_destroy(cubeb * ctx,
 }
 
 static int
-pulse_stream_get_current_device(cubeb_stream * stm,
-                                cubeb_device ** const device)
+pulse_stream_get_current_device(cubeb_stream * stm, cubeb_device * const device)
 {
 #if PA_CHECK_VERSION(0, 9, 8)
-  *device = calloc(1, sizeof(cubeb_device));
-  if (*device == NULL)
-    return CUBEB_ERROR;
-
   if (stm->input_stream) {
-    (*device)->input_name = WRAP(pa_stream_get_device_name)(stm->input_stream);
+    device->input_name = WRAP(pa_stream_get_device_name)(stm->input_stream);
   }
 
   if (stm->output_stream) {
-    (*device)->output_name =
-        WRAP(pa_stream_get_device_name)(stm->output_stream);
+    device->output_name = WRAP(pa_stream_get_device_name)(stm->output_stream);
   }
 
   return CUBEB_OK;
@@ -1553,7 +1547,7 @@ static int
 pulse_stream_device_destroy(cubeb_stream * stream, cubeb_device * device)
 {
   (void)stream;
-  free(device);
+  (void)device;
   return CUBEB_OK;
 }
 
diff --git a/src/cubeb_sun.c b/src/cubeb_sun.c
@@ -690,22 +690,18 @@ sun_stream_set_volume(cubeb_stream * stream, float volume)
 }
 
 static int
-sun_get_current_device(cubeb_stream * stream, cubeb_device ** const device)
+sun_get_current_device(cubeb_stream * stream, cubeb_device * const device)
 {
-  *device = calloc(1, sizeof(cubeb_device));
-  if (*device == NULL) {
-    return CUBEB_ERROR;
-  }
-  (*device)->input_name = stream->record.fd != -1 ? stream->record.name : NULL;
-  (*device)->output_name = stream->play.fd != -1 ? stream->play.name : NULL;
+  device->input_name = stream->record.fd != -1 ? stream->record.name : NULL;
+  device->output_name = stream->play.fd != -1 ? stream->play.name : NULL;
   return CUBEB_OK;
 }
 
 static int
 sun_stream_device_destroy(cubeb_stream * stream, cubeb_device * device)
 {
   (void)stream;
-  free(device);
+  (void)device;
   return CUBEB_OK;
 }
 
diff --git a/test/test_devices.cpp b/test/test_devices.cpp
@@ -247,7 +247,7 @@ TEST(cubeb, stream_get_current_device)
   std::unique_ptr<cubeb_stream, decltype(&cubeb_stream_destroy)>
       cleanup_stream_at_exit(stream, cubeb_stream_destroy);
 
-  cubeb_device * device;
+  cubeb_device device;
   r = cubeb_stream_get_current_device(stream, &device);
   if (r == CUBEB_ERROR_NOT_SUPPORTED) {
     fprintf(stderr, "Getting current device is not supported"
@@ -256,9 +256,9 @@ TEST(cubeb, stream_get_current_device)
   }
   ASSERT_EQ(r, CUBEB_OK) << "Error getting current devices";
 
-  fprintf(stdout, "Current output device: %s\n", device->output_name);
-  fprintf(stdout, "Current input device: %s\n", device->input_name);
+  fprintf(stdout, "Current output device: %s\n", device.output_name);
+  fprintf(stdout, "Current input device: %s\n", device.input_name);
 
-  r = cubeb_stream_device_destroy(stream, device);
+  r = cubeb_stream_device_destroy(stream, &device);
   ASSERT_EQ(r, CUBEB_OK) << "Error destroying current devices";
 }

Original file line number	Diff line number	Diff line change
`@@ -559,7 +559,7 @@ cubeb_stream_set_name(cubeb_stream * stream, char const * stream_name)`
`559`	`559`
`560`	`560`	`int`
`561`	`561`	`cubeb_stream_get_current_device(cubeb_stream * stream,`
`562`		`- cubeb_device ** const device)`
	`562`	`+ cubeb_device * const device)`
`563`	`563`	`{`
`564`	`564`	`if (!stream \|\| !device) {`
`565`	`565`	`return CUBEB_ERROR_INVALID_PARAMETER;`
Original file line number	Diff line number	Diff line change
`@@ -1306,22 +1306,18 @@ oss_stream_set_volume(cubeb_stream * stream, float volume)`
`1306`	`1306`	`}`
`1307`	`1307`
`1308`	`1308`	`static int`
`1309`		`-oss_get_current_device(cubeb_stream * stream, cubeb_device ** const device)`
	`1309`	`+oss_get_current_device(cubeb_stream * stream, cubeb_device * const device)`
`1310`	`1310`	`{`
`1311`		`- *device = calloc(1, sizeof(cubeb_device));`
`1312`		`- if (*device == NULL) {`
`1313`		`- return CUBEB_ERROR;`
`1314`		`- }`
`1315`		`- (*device)->input_name = stream->record.fd != -1 ? stream->record.name : NULL;`
`1316`		`- (*device)->output_name = stream->play.fd != -1 ? stream->play.name : NULL;`
	`1311`	`+ device->input_name = stream->record.fd != -1 ? stream->record.name : NULL;`
	`1312`	`+ device->output_name = stream->play.fd != -1 ? stream->play.name : NULL;`
`1317`	`1313`	`return CUBEB_OK;`
`1318`	`1314`	`}`
`1319`	`1315`
`1320`	`1316`	`static int`
`1321`	`1317`	`oss_stream_device_destroy(cubeb_stream * stream, cubeb_device * device)`
`1322`	`1318`	`{`
`1323`	`1319`	`(void)stream;`
`1324`		`- free(device);`
	`1320`	`+ (void)device;`
`1325`	`1321`	`return CUBEB_OK;`
`1326`	`1322`	`}`
`1327`	`1323`
Original file line number	Diff line number	Diff line change
`@@ -1526,21 +1526,15 @@ pulse_device_collection_destroy(cubeb * ctx,`
`1526`	`1526`	`}`
`1527`	`1527`
`1528`	`1528`	`static int`
`1529`		`-pulse_stream_get_current_device(cubeb_stream * stm,`
`1530`		`- cubeb_device ** const device)`
	`1529`	`+pulse_stream_get_current_device(cubeb_stream * stm, cubeb_device * const device)`
`1531`	`1530`	`{`
`1532`	`1531`	`#if PA_CHECK_VERSION(0, 9, 8)`
`1533`		`- *device = calloc(1, sizeof(cubeb_device));`
`1534`		`- if (*device == NULL)`
`1535`		`- return CUBEB_ERROR;`
`1536`		`-`
`1537`	`1532`	`if (stm->input_stream) {`
`1538`		`- (*device)->input_name = WRAP(pa_stream_get_device_name)(stm->input_stream);`
	`1533`	`+ device->input_name = WRAP(pa_stream_get_device_name)(stm->input_stream);`
`1539`	`1534`	`}`
`1540`	`1535`
`1541`	`1536`	`if (stm->output_stream) {`
`1542`		`- (*device)->output_name =`
`1543`		`- WRAP(pa_stream_get_device_name)(stm->output_stream);`
	`1537`	`+ device->output_name = WRAP(pa_stream_get_device_name)(stm->output_stream);`
`1544`	`1538`	`}`
`1545`	`1539`
`1546`	`1540`	`return CUBEB_OK;`
`@@ -1553,7 +1547,7 @@ static int`
`1553`	`1547`	`pulse_stream_device_destroy(cubeb_stream * stream, cubeb_device * device)`
`1554`	`1548`	`{`
`1555`	`1549`	`(void)stream;`
`1556`		`- free(device);`
	`1550`	`+ (void)device;`
`1557`	`1551`	`return CUBEB_OK;`
`1558`	`1552`	`}`
`1559`	`1553`
Original file line number	Diff line number	Diff line change
`@@ -690,22 +690,18 @@ sun_stream_set_volume(cubeb_stream * stream, float volume)`
`690`	`690`	`}`
`691`	`691`
`692`	`692`	`static int`
`693`		`-sun_get_current_device(cubeb_stream * stream, cubeb_device ** const device)`
	`693`	`+sun_get_current_device(cubeb_stream * stream, cubeb_device * const device)`
`694`	`694`	`{`
`695`		`- *device = calloc(1, sizeof(cubeb_device));`
`696`		`- if (*device == NULL) {`
`697`		`- return CUBEB_ERROR;`
`698`		`- }`
`699`		`- (*device)->input_name = stream->record.fd != -1 ? stream->record.name : NULL;`
`700`		`- (*device)->output_name = stream->play.fd != -1 ? stream->play.name : NULL;`
	`695`	`+ device->input_name = stream->record.fd != -1 ? stream->record.name : NULL;`
	`696`	`+ device->output_name = stream->play.fd != -1 ? stream->play.name : NULL;`
`701`	`697`	`return CUBEB_OK;`
`702`	`698`	`}`
`703`	`699`
`704`	`700`	`static int`
`705`	`701`	`sun_stream_device_destroy(cubeb_stream * stream, cubeb_device * device)`
`706`	`702`	`{`
`707`	`703`	`(void)stream;`
`708`		`- free(device);`
	`704`	`+ (void)device;`
`709`	`705`	`return CUBEB_OK;`
`710`	`706`	`}`
`711`	`707`