Attachment 825779 Details for Bug 1031785 – Move initialization of path variable up

[patch] Move initialization of path variable up

0001-Initialize-path-before-first-use.patch (text/plain), 1.57 KB, created by Klaus Kämpf on 2013-11-18 18:33:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Klaus Kämpf

Created: 2013-11-18 18:33:46 UTC

Size: 1.57 KB

patch

obsolete

>From 2db1f0fb16e5c833973a64119628044a545a3890 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
>Date: Mon, 18 Nov 2013 11:27:42 -0700
>Subject: [PATCH 1/2] Initialize path before first use
>
>---
> src/logicalfile/LMI_DirectoryContainsFileProvider.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/src/logicalfile/LMI_DirectoryContainsFileProvider.c b/src/logicalfile/LMI_DirectoryContainsFileProvider.c
>index 40fa567d3321..be3c0a952b51 100644
>--- a/src/logicalfile/LMI_DirectoryContainsFileProvider.c
>+++ b/src/logicalfile/LMI_DirectoryContainsFileProvider.c
>@@ -173,6 +173,9 @@ static CMPIStatus associators(
>         if (st.rc != CMPI_RC_OK) {
>             return st;
>         }
>+        path = get_string_property_from_op(cop, "Name");
>+        if (!path)
>+            CMReturnWithChars(_cb, CMPI_RC_ERR_NOT_FOUND, "Cannot find Name property in provided LMI_UnixDirectory");
>         st = dir_file_objectpaths(cc, cr, resultClass, group, rgroup, properties, ns, path, refs, &count);
>         if (st.rc != CMPI_RC_OK) {
>             return st;
>@@ -180,9 +183,6 @@ static CMPIStatus associators(
>         if (count > MAX_REFS) {
>             CMReturnWithChars(_cb, CMPI_RC_ERR_NOT_FOUND, "Too many files in a single directory...");
>         }
>-        path = get_string_property_from_op(cop, "Name");
>-        if (!path)
>-            CMReturnWithChars(_cb, CMPI_RC_ERR_NOT_FOUND, "Cannot find Name property in provided LMI_UnixDirectory");
> 
>         /* TODO: directories are walked in two passes
>          * rewrite using only one pass */
>-- 
>1.8.4
>

Actions: View | Diff

Attachments on bug 1031785: 825779