[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 1/5] ftpfs: fix error handling in refresh_dir
From: |
Samuel Thibault |
Subject: |
Re: [PATCH 1/5] ftpfs: fix error handling in refresh_dir |
Date: |
Wed, 18 Jun 2014 00:33:39 +0200 |
User-agent: |
Mutt/1.5.21+34 (58baf7c9f32f) (2010-12-30) |
Justus Winter, le Mon 16 Jun 2014 19:49:25 +0200, a écrit :
> Found using the Clang Static Analyzer.
Ack.
> * ftpfs/dir.c (refresh_dir): Fix error handling.
> ---
> ftpfs/dir.c | 20 ++++++++++++--------
> 1 file changed, 12 insertions(+), 8 deletions(-)
>
> diff --git a/ftpfs/dir.c b/ftpfs/dir.c
> index da5ddbe..a9fea22 100644
> --- a/ftpfs/dir.c
> +++ b/ftpfs/dir.c
> @@ -384,14 +384,18 @@ refresh_dir (struct ftpfs_dir *dir, int update_stats,
> time_t timestamp,
> if (! err)
> err = update_ordered_name ("..", &dfs);
>
> - /* Refetch the directory from the server. */
> - if (update_stats)
> - /* Fetch both names and stat info. */
> - err = ftp_conn_get_stats (conn, dir->rmt_path, 1,
> - update_ordered_entry, &dfs);
> - else
> - /* Just fetch names. */
> - err = ftp_conn_get_names (conn, dir->rmt_path, update_ordered_name,
> &dfs);
> + if (! err)
> + {
> + /* Refetch the directory from the server. */
> + if (update_stats)
> + /* Fetch both names and stat info. */
> + err = ftp_conn_get_stats (conn, dir->rmt_path, 1,
> + update_ordered_entry, &dfs);
> + else
> + /* Just fetch names. */
> + err = ftp_conn_get_names (conn, dir->rmt_path,
> + update_ordered_name, &dfs);
> + }
>
> if (! err)
> /* GC any directory entries that weren't seen this time. */
> --
> 2.0.0
>
--
Samuel
<D> N: j'aime bien Cut d'un truc enorme... ca montre de quel cote de l'ecran
sont les couilles :)))
-+- #ens-mim et la peufeupeu -+-