Type: fix
Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: I342d8f928fcc7de74f9bd288c1a5d63ea1f90020
-int
-fcntl (int fd, int cmd, ...)
+static int
+fcntl_internal (int fd, int cmd, va_list ap)
{
vls_handle_t vlsh;
int rv = 0;
{
vls_handle_t vlsh;
int rv = 0;
- va_list ap;
-
- if ((errno = -ldp_init ()))
- return -1;
-
- va_start (ap, cmd);
vlsh = ldp_fd_to_vlsh (fd);
LDBG (0, "fd %u vlsh %d, cmd %u", fd, vlsh, cmd);
vlsh = ldp_fd_to_vlsh (fd);
LDBG (0, "fd %u vlsh %d, cmd %u", fd, vlsh, cmd);
+ return rv;
+}
+
+int
+fcntl (int fd, int cmd, ...)
+{
+ va_list ap;
+ int rv;
+
+ if ((errno = -ldp_init ()))
+ return -1;
+
+ va_start (ap, cmd);
+ rv = fcntl_internal (fd, cmd, ap);
+ if ((errno = -ldp_init ()))
+ return -1;
+
- rv = fcntl (fd, cmd, ap);
+ rv = fcntl_internal (fd, cmd, ap);
va_end (ap);
return rv;
}
va_end (ap);
return rv;
}
int
libc_vfcntl (int fd, int cmd, va_list ap)
{
int
libc_vfcntl (int fd, int cmd, va_list ap)
{
- long int args[4];
- int rc;
- int i;
-
swrap_bind_symbol_libc (fcntl);
swrap_bind_symbol_libc (fcntl);
-
- for (i = 0; i < 4; i++)
- {
- args[i] = va_arg (ap, long int);
- }
-
- rc = swrap.libc.symbols._libc_fcntl.f (fd,
- cmd,
- args[0], args[1], args[2], args[3]);
-
- return rc;
+ return swrap.libc.symbols._libc_fcntl.f (fd, cmd, va_arg (ap, long int));
}
#ifdef HAVE_FCNTL64
int
libc_vfcntl64 (int fd, int cmd, va_list ap)
{
}
#ifdef HAVE_FCNTL64
int
libc_vfcntl64 (int fd, int cmd, va_list ap)
{
- long int args[4];
- int rc;
- int i;
-
swrap_bind_symbol_libc (fcntl64);
swrap_bind_symbol_libc (fcntl64);
-
- for (i = 0; i < 4; i++)
- {
- args[i] = va_arg (ap, long int);
- }
-
- rc = swrap.libc.symbols._libc_fcntl64.f (fd,
- cmd,
- args[0], args[1], args[2],
- args[3]);
-
- return rc;
+ return swrap.libc.symbols._libc_fcntl64.f (fd, cmd, va_arg (ap, long int));
int libc_vfcntl (int fd, int cmd, va_list ap);
int libc_vfcntl (int fd, int cmd, va_list ap);
int libc_vfcntl64 (int fd, int cmd, va_list ap);
int libc_vfcntl64 (int fd, int cmd, va_list ap);
int libc_vioctl (int fd, int cmd, va_list ap);
int libc_vioctl (int fd, int cmd, va_list ap);