diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2010-11-30 22:16:25 +0000 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2010-11-30 22:16:25 +0000 |
| commit | a8d4cd68eb13fd063bae761624cede16321092f4 (patch) | |
| tree | ffc577b5b4cefa64e2bbe850d39e13f160b4094f /daemons/clvmd/clvmd-command.c | |
| parent | 41cf252f0b3f30cdad57c1514b5974956e1c635e (diff) | |
| download | lvm2-a8d4cd68eb13fd063bae761624cede16321092f4.tar.gz lvm2-a8d4cd68eb13fd063bae761624cede16321092f4.tar.xz lvm2-a8d4cd68eb13fd063bae761624cede16321092f4.zip | |
Replace snprintf with dm_snprintf
Use dm_snprintf with known error case return code (-1).
Diffstat (limited to 'daemons/clvmd/clvmd-command.c')
| -rw-r--r-- | daemons/clvmd/clvmd-command.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/daemons/clvmd/clvmd-command.c b/daemons/clvmd/clvmd-command.c index 8d1dcff5..915fcc7e 100644 --- a/daemons/clvmd/clvmd-command.c +++ b/daemons/clvmd/clvmd-command.c @@ -97,10 +97,10 @@ int do_command(struct local_client *client, struct clvm_header *msg, int msglen, } if (*buf) { uname(&nodeinfo); - *retlen = 1 + snprintf(*buf, buflen, - "TEST from %s: %s v%s", - nodeinfo.nodename, args, - nodeinfo.release); + *retlen = 1 + dm_snprintf(*buf, buflen, + "TEST from %s: %s v%s", + nodeinfo.nodename, args, + nodeinfo.release); } break; @@ -121,9 +121,8 @@ int do_command(struct local_client *client, struct clvm_header *msg, int msglen, status = do_lock_lv(lock_cmd, lock_flags, lockname); /* Replace EIO with something less scary */ if (status == EIO) { - *retlen = - 1 + snprintf(*buf, buflen, "%s", - get_last_lvm_error()); + *retlen = 1 + dm_snprintf(*buf, buflen, "%s", + get_last_lvm_error()); return EIO; } break; @@ -133,7 +132,7 @@ int do_command(struct local_client *client, struct clvm_header *msg, int msglen, if (buflen < 3) return EIO; if ((locktype = do_lock_query(lockname))) - *retlen = 1 + snprintf(*buf, buflen, "%s", locktype); + *retlen = 1 + dm_snprintf(*buf, buflen, "%s", locktype); break; case CLVMD_CMD_REFRESH: @@ -169,8 +168,8 @@ int do_command(struct local_client *client, struct clvm_header *msg, int msglen, /* Check the status of the command and return the error text */ if (status) { - *retlen = 1 + (*buf) ? snprintf(*buf, buflen, "%s", - strerror(status)) : -1; + *retlen = 1 + (*buf) ? dm_snprintf(*buf, buflen, "%s", + strerror(status)) : -1; } return status; @@ -377,7 +376,7 @@ static int restart_clvmd(void) /* Propogate debug options */ if (debug) { if (!(debug_arg = malloc(16)) || - snprintf(debug_arg, 16, "-d%d", (int)debug) < 0) + dm_snprintf(debug_arg, 16, "-d%d", (int)debug) < 0) goto_out; argv[argc++] = debug_arg; } |