From: wessels <>
Date: Thu, 12 Apr 2007 03:22:27 +0000 (+0000)
Subject: Fixed parsing diskd cache_dir Q1 and Q2 options
X-Git-Tag: SQUID_3_0_PRE6~118
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f2d056f8c5fa6fd2f5ba2e3045567c52abd52f7;p=thirdparty%2Fsquid.git

Fixed parsing diskd cache_dir Q1 and Q2 options

UFSSwapDir::getOptionTree() was calling the DiskdIOStrategy::getOptionTree()
method, but was not using its return value.
---

diff --git a/src/fs/ufs/store_dir_ufs.cc b/src/fs/ufs/store_dir_ufs.cc
index 4d600e6a04..51140139a7 100644
--- a/src/fs/ufs/store_dir_ufs.cc
+++ b/src/fs/ufs/store_dir_ufs.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_dir_ufs.cc,v 1.77 2006/10/02 01:31:59 adrian Exp $
+ * $Id: store_dir_ufs.cc,v 1.78 2007/04/11 21:22:27 wessels Exp $
  *
  * DEBUG: section 47    Store Directory Routines
  * AUTHOR: Duane Wessels
@@ -196,11 +196,7 @@ UFSSwapDir::getOptionTree() const
 
     currentIOOptions->options.push_back(new ConfigOptionAdapter<UFSSwapDir>(*const_cast<UFSSwapDir *>(this), &UFSSwapDir::optionIOParse, &UFSSwapDir::optionIODump));
 
-    ConfigOption *ioOptions = NULL;
-    
-    IO->io->getOptionTree();
-
-    if (ioOptions)
+    if (ConfigOption *ioOptions = IO->io->getOptionTree())
         currentIOOptions->options.push_back(ioOptions);
 
     ConfigOption* result = currentIOOptions;