diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2012-07-19 16:24:55 +0100 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2012-08-05 22:48:51 +0100 |
| commit | 2d3d09f16fc6a0b7ed41a94b09bdc7753f6f7da2 (patch) | |
| tree | 6bb56be7e2638c3b09ae85b15d479859c6a99127 | |
| parent | 23beb95042ddaa38da74d34b0d43bb5e760cb782 (diff) | |
| download | libguestfs-2d3d09f16fc6a0b7ed41a94b09bdc7753f6f7da2.tar.gz libguestfs-2d3d09f16fc6a0b7ed41a94b09bdc7753f6f7da2.tar.xz libguestfs-2d3d09f16fc6a0b7ed41a94b09bdc7753f6f7da2.zip | |
lib: Use safe_asprintf when constructing attach_method.
Just a small code cleanup / simplification.
(cherry picked from commit eca544d87d9335123077e30b7547270b6bfe0f2b)
| -rw-r--r-- | src/guestfs.c | 4 | ||||
| -rw-r--r-- | src/libvirtdomain.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/guestfs.c b/src/guestfs.c index ef0ca167..46326e48 100644 --- a/src/guestfs.c +++ b/src/guestfs.c @@ -808,9 +808,7 @@ guestfs__get_attach_method (guestfs_h *g) break; case ATTACH_METHOD_UNIX: - ret = safe_malloc (g, strlen (g->attach_method_arg) + 5 + 1); - strcpy (ret, "unix:"); - strcat (ret, g->attach_method_arg); + ret = safe_asprintf (g, "unix:%s", g->attach_method_arg); break; default: /* keep GCC happy - this is not reached */ diff --git a/src/libvirtdomain.c b/src/libvirtdomain.c index 4ff23765..6be45289 100644 --- a/src/libvirtdomain.c +++ b/src/libvirtdomain.c @@ -584,9 +584,7 @@ connect_live (guestfs_h *g, virDomainPtr dom) } /* Got a path. */ - attach_method = safe_malloc (g, strlen (path) + 5 + 1); - strcpy (attach_method, "unix:"); - strcat (attach_method, path); + attach_method = safe_asprintf (g, "unix:%s", path); r = guestfs_set_attach_method (g, attach_method); cleanup: |