mirror of
https://github.com/apache/nuttx.git
synced 2026-06-07 09:18:00 +08:00
Call nxsem_destroy or nxmutex_destry in the error path
1.Don't check the return value of nxsem_init or nxmutex_init 2.Fix some style issue Signed-off-by: anjiahao <anjiahao@xiaomi.com> Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
committed by
Petro Karashchenko
parent
99cfffc96a
commit
d7b4e91dda
@@ -144,6 +144,15 @@ static inline int syslog_dev_lock(FAR struct syslog_dev_s *syslog_dev)
|
||||
return nxrmutex_lock(&syslog_dev->sl_lock);
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
* Name: syslog_dev_unlock
|
||||
****************************************************************************/
|
||||
|
||||
static inline void syslog_dev_unlock(FAR struct syslog_dev_s *syslog_dev)
|
||||
{
|
||||
nxrmutex_unlock(&syslog_dev->sl_lock);
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
* Name: syslog_dev_open
|
||||
*
|
||||
@@ -499,12 +508,12 @@ static ssize_t syslog_dev_write(FAR struct syslog_channel_s *channel,
|
||||
}
|
||||
}
|
||||
|
||||
nxrmutex_unlock(&syslog_dev->sl_lock);
|
||||
syslog_dev_unlock(syslog_dev);
|
||||
return buflen;
|
||||
|
||||
errout_with_lock:
|
||||
syslog_dev->sl_state = SYSLOG_FAILURE;
|
||||
nxrmutex_unlock(&syslog_dev->sl_lock);
|
||||
syslog_dev_unlock(syslog_dev);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -588,7 +597,7 @@ static int syslog_dev_putc(FAR struct syslog_channel_s *channel, int ch)
|
||||
nbytes = file_write(&syslog_dev->sl_file, &uch, 1);
|
||||
}
|
||||
|
||||
nxrmutex_unlock(&syslog_dev->sl_lock);
|
||||
syslog_dev_unlock(syslog_dev);
|
||||
|
||||
/* Check if the write was successful. If not, nbytes will be
|
||||
* a negated errno value.
|
||||
@@ -689,7 +698,7 @@ static int syslog_dev_flush(FAR struct syslog_channel_s *channel)
|
||||
FAR struct syslog_channel_s *syslog_dev_initialize(FAR const char *devpath,
|
||||
int oflags, int mode)
|
||||
{
|
||||
FAR struct syslog_dev_s * syslog_dev;
|
||||
FAR struct syslog_dev_s *syslog_dev;
|
||||
|
||||
syslog_dev = kmm_zalloc(sizeof(struct syslog_dev_s));
|
||||
|
||||
|
||||
Reference in New Issue
Block a user