Changeset 1916 for branches/c08_branch/source/cdgetlinelist.cpp

Timestamp:

04/04/08 03:02:50 (9 months ago)

Author:

gary

Message:

merge of r1913-1915 on mainline

Files:

• branches/c08_branch/source/cdgetlinelist.cpp (modified) (3 diffs)

branches/c08_branch/source/cdgetlinelist.cpp

@@ -2 +2 @@
  * others.  For conditions of distribution and use see copyright notice in license.txt */
 /*cdGetLineList routine to read in master list of emission line wavelengths and ids, for
- * generating loc grids,
- * someday add cdGetNLRLineList */
+ * generating loc grids */
 #include "cddefines.h"
 #include "cddrive.h"
@@ -38 +37 @@
         chFilename = ( strlen(chFile) == 0 ) ? "LineList_BLR.dat" : chFile;
 
-        /* >>chng 04 nov 06, had searched only on path, now search locally 
-         * and then on path if not found */
         /* we will check local space first, then on path if not present */
         ioData = open_data( chFilename, "r", AS_LOCAL_DATA_TRY );
 
         if( ioData == NULL )
+        {
+                /* did not find file, return -1 */
                 return -1;
+        }
 
         /* count how many lines are in the file, ignoring all lines
@@ -69 +69 @@
 
         /* create 1-d array of string labels */
-        /* create first dim of space for labels */
         *chLabels = (char**)MALLOC((size_t)(nLines+1)*sizeof(char *) );