All files in this commit: Added ifdef for Apple compilation - it does not have a malloc.h include file.

epanet.c
reset file variables to NULL so if the code is executed again without termination, the variables will be in a valid initial state.

Added retrieval of EN_STARTTIME to ENgettimeparam.
Added retrieval of EN_TANKVOLUME to ENgetnodevalue
Added retrieval of EN_LINKQUAL to ENgetlinkvalue
Fixed the check for identical filenames so it now allows for an empty (not generated) report file and outfile.
Added ENgetbasedemand and ENgetdemandpattern functions

input2.c
Fixed some compiler warnings


git-svn-id: https://epanet.svn.sourceforge.net/svnroot/epanet/BASE/trunk@424 c320cabd-cc23-0410-96d8-e60fbf53ed7f

src/input2.c

@@ -28,7 +28,9 @@ The following utility functions are all called from INPUT3.C
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#ifndef __APPLE__
 #include <malloc.h>
+#endif
 #include <math.h>
 #include "hash.h"
 #include "text.h"
@@ -261,7 +263,7 @@ int  newline(int sect, char *line)
    {
        case _TITLE:       if (Ntitle < 3)
                           {
-                             n = strlen(line);
+                             n = (int)strlen(line);
                              if (line[n-1] == 10) line[n-1] = ' ';
                              strncpy(Title[Ntitle],line,MAXMSG);
                              Ntitle++;
@@ -783,12 +785,12 @@ int  gettokens(char *s)
 /* Truncate s at start of comment */
    c = strchr(s,';');
    if (c) *c = '\0';
-   len = strlen(s);
+   len = (int)strlen(s);
 
 /* Scan s for tokens until nothing left */
    while (len > 0 && n < MAXTOKS)
    {
-       m = strcspn(s,SEPSTR);          /* Find token length */
+       m = (int)strcspn(s,SEPSTR);          /* Find token length */
        len -= m+1;                     /* Update length of s */
        if (m == 0) s++;                /* No token found */
        else
@@ -796,7 +798,7 @@ int  gettokens(char *s)
           if (*s == '"')               /* Token begins with quote */
           {
              s++;                      /* Start token after quote */
-             m = strcspn(s,"\"\n\r");  /* Find end quote (or EOL) */
+             m = (int)strcspn(s,"\"\n\r");  /* Find end quote (or EOL) */
           }                            
           s[m] = '\0';                 /* Null-terminate the token */
           Tok[n] = s;                  /* Save pointer to token */