From: Ray Strode <rstrode@redhat.com>
Date: Wed, 16 May 2007 18:56:42 +0000 (-0400)
Subject: Make ply_terminal_get_name return a non-freeable string
X-Git-Tag: 0.1.0~296
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=341e89438f87060584d180e3bd6bf801f0ed84ea;p=thirdparty%2Fplymouth.git

Make ply_terminal_get_name return a non-freeable string
Previously ply_terminal_get_name would return a duplicated
copy of its name that the caller would have to free.
---

diff --git a/src/ply-terminal.c b/src/ply-terminal.c
index 11876bed..196ff3a0 100644
--- a/src/ply-terminal.c
+++ b/src/ply-terminal.c
@@ -124,14 +124,14 @@ ply_terminal_get_fd (ply_terminal_t *terminal)
   return terminal->fd;
 }
 
-char *
+const char *
 ply_terminal_get_name (ply_terminal_t *terminal)
 {
   assert (terminal != NULL);
   assert (ply_terminal_is_open (terminal));
 
   assert (terminal->name != NULL);
-  return strdup (terminal->name);
+  return terminal->name;
 }
 
 #ifdef PLY_TERMINAL_ENABLE_TEST
@@ -143,7 +143,7 @@ main (int    argc,
       char **argv)
 {
   ply_terminal_t *terminal;
-  char *name;
+  const char *name;
   uint8_t byte;
   int exit_code;
 
diff --git a/src/ply-terminal.h b/src/ply-terminal.h
index cfdc3c57..4821ed26 100644
--- a/src/ply-terminal.h
+++ b/src/ply-terminal.h
@@ -35,7 +35,7 @@ bool ply_terminal_open (ply_terminal_t *terminal);
 bool ply_terminal_is_open (ply_terminal_t *terminal);
 void ply_terminal_close (ply_terminal_t *terminal);
 int ply_terminal_get_fd (ply_terminal_t *terminal);
-char *ply_terminal_get_name (ply_terminal_t *terminal);
+const char *ply_terminal_get_name (ply_terminal_t *terminal);
 #endif
 
 #endif /* PLY_TERMINAL_H */