Re: [Mesa-dev] [PATCH 2/2] disk_cache: remove unnecessary NULL-pointer guards

[Marek Olšák]

Reviewed-by: Marek Olšák 

Marek

On Fri, Oct 6, 2017 at 10:21 PM, Nicolai Hähnle  wrote:
> From: Nicolai Hähnle 
>
> ---
>  src/util/disk_cache.c | 6 ++
>  1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c
> index 63fd8e1f93a..e38cacb259b 100644
> --- a/src/util/disk_cache.c
> +++ b/src/util/disk_cache.c
> @@ -980,24 +980,22 @@ cache_put(void *job, int thread_index)
> p_atomic_add(dc_job->cache->size, sb.st_blocks * 512);
>
>   done:
> if (fd_final != -1)
>close(fd_final);
> /* This close finally releases the flock, (now that the final file
>  * has been renamed into place and the size has been added).
>  */
> if (fd != -1)
>close(fd);
> -   if (filename_tmp)
> -  free(filename_tmp);
> -   if (filename)
> -  free(filename);
> +   free(filename_tmp);
> +   free(filename);
>  }
>
>  void
>  disk_cache_put(struct disk_cache *cache, const cache_key key,
> const void *data, size_t size,
> struct cache_item_metadata *cache_item_metadata)
>  {
> struct disk_cache_put_job *dc_job =
>create_put_job(cache, key, data, size, cache_item_metadata);
>
> --
> 2.11.0
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH 2/2] disk_cache: remove unnecessary NULL-pointer guards

[Nicolai Hähnle]

From: Nicolai Hähnle 

---
 src/util/disk_cache.c | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c
index 63fd8e1f93a..e38cacb259b 100644
--- a/src/util/disk_cache.c
+++ b/src/util/disk_cache.c
@@ -980,24 +980,22 @@ cache_put(void *job, int thread_index)
p_atomic_add(dc_job->cache->size, sb.st_blocks * 512);
 
  done:
if (fd_final != -1)
   close(fd_final);
/* This close finally releases the flock, (now that the final file
 * has been renamed into place and the size has been added).
 */
if (fd != -1)
   close(fd);
-   if (filename_tmp)
-  free(filename_tmp);
-   if (filename)
-  free(filename);
+   free(filename_tmp);
+   free(filename);
 }
 
 void
 disk_cache_put(struct disk_cache *cache, const cache_key key,
const void *data, size_t size,
struct cache_item_metadata *cache_item_metadata)
 {
struct disk_cache_put_job *dc_job =
   create_put_job(cache, key, data, size, cache_item_metadata);
 
-- 
2.11.0

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev