Make the returned device names constant to avoid allocating them

Signed-off-by: Marcin Serwin <marcin@serwin.dev>

Author: marcin-serwin

include/cubeb/cubeb.h

@@ -287,8 +287,8 @@ typedef struct {
 
 /** Audio device description */
 typedef struct {
-  char * output_name; /**< The name of the output device */
-  char * input_name;  /**< The name of the input device */
+  const char * output_name; /**< The name of the output device */
+  const char * input_name;  /**< The name of the input device */
 } cubeb_device;
 
 /** Stream states signaled via state_callback. */

src/cubeb_jack.cpp

@@ -1086,14 +1086,14 @@ cbjack_stream_get_current_device(cubeb_stream * stm,
   const char * empty = "";
 
   if (stm->devs == DUPLEX) {
-    (*device)->input_name = strdup(j_in);
-    (*device)->output_name = strdup(j_out);
+    (*device)->input_name = j_in;
+    (*device)->output_name = j_out;
   } else if (stm->devs == IN_ONLY) {
-    (*device)->input_name = strdup(j_in);
-    (*device)->output_name = strdup(empty);
+    (*device)->input_name = j_in;
+    (*device)->output_name = empty;
   } else if (stm->devs == OUT_ONLY) {
-    (*device)->input_name = strdup(empty);
-    (*device)->output_name = strdup(j_out);
+    (*device)->input_name = empty;
+    (*device)->output_name = j_out;
   }
 
   return CUBEB_OK;
@@ -1102,10 +1102,6 @@ cbjack_stream_get_current_device(cubeb_stream * stm,
 static int
 cbjack_stream_device_destroy(cubeb_stream * /*stream*/, cubeb_device * device)
 {
-  if (device->input_name)
-    free(device->input_name);
-  if (device->output_name)
-    free(device->output_name);
   free(device);
   return CUBEB_OK;
 }

src/cubeb_oss.c

@@ -1312,19 +1312,15 @@ oss_get_current_device(cubeb_stream * stream, cubeb_device ** const device)
   if (*device == NULL) {
     return CUBEB_ERROR;
   }
-  (*device)->input_name =
-      stream->record.fd != -1 ? strdup(stream->record.name) : NULL;
-  (*device)->output_name =
-      stream->play.fd != -1 ? strdup(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->input_name);
-  free(device->output_name);
   free(device);
   return CUBEB_OK;
 }

src/cubeb_pulse.c

@@ -1535,13 +1535,12 @@ pulse_stream_get_current_device(cubeb_stream * stm,
     return CUBEB_ERROR;
 
   if (stm->input_stream) {
-    const char * name = WRAP(pa_stream_get_device_name)(stm->input_stream);
-    (*device)->input_name = (name == NULL) ? NULL : strdup(name);
+    (*device)->input_name = WRAP(pa_stream_get_device_name)(stm->input_stream);
   }
 
   if (stm->output_stream) {
-    const char * name = WRAP(pa_stream_get_device_name)(stm->output_stream);
-    (*device)->output_name = (name == NULL) ? NULL : strdup(name);
+    (*device)->output_name =
+        WRAP(pa_stream_get_device_name)(stm->output_stream);
   }
 
   return CUBEB_OK;
@@ -1554,8 +1553,6 @@ static int
 pulse_stream_device_destroy(cubeb_stream * stream, cubeb_device * device)
 {
   (void)stream;
-  free(device->input_name);
-  free(device->output_name);
   free(device);
   return CUBEB_OK;
 }

src/cubeb_sun.c

@@ -696,19 +696,15 @@ sun_get_current_device(cubeb_stream * stream, cubeb_device ** const device)
   if (*device == NULL) {
     return CUBEB_ERROR;
   }
-  (*device)->input_name =
-      stream->record.fd != -1 ? strdup(stream->record.name) : NULL;
-  (*device)->output_name =
-      stream->play.fd != -1 ? strdup(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->input_name);
-  free(device->output_name);
   free(device);
   return CUBEB_OK;
 }