/[svn]/liblscp/trunk/src/common.c
ViewVC logotype

Diff of /liblscp/trunk/src/common.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 180 by capela, Tue Jul 6 20:20:51 2004 UTC revision 187 by capela, Wed Jul 7 23:41:07 2004 UTC
# Line 358  int *lscp_isplit_create ( const char *ps Line 358  int *lscp_isplit_create ( const char *ps
358      int iSize, i, j, cchSeps;      int iSize, i, j, cchSeps;
359      int *piSplit, *piNewSplit;      int *piSplit, *piNewSplit;
360    
361        // Get it clean first.
362        pchHead = lscp_ltrim((char *) pszCsv);
363        if (*pchHead == (char) 0)
364            return NULL;
365        
366      // Initial size is one chunk away.      // Initial size is one chunk away.
367      iSize = LSCP_SPLIT_CHUNK1;      iSize = LSCP_SPLIT_CHUNK1;
368      // Allocate and split...      // Allocate and split...
# Line 367  int *lscp_isplit_create ( const char *ps Line 372  int *lscp_isplit_create ( const char *ps
372    
373      // Make a copy of the original string.      // Make a copy of the original string.
374      i = 0;      i = 0;
     pchHead = (char *) pszCsv;  
375      if ((piSplit[i++] = atoi(pchHead)) < 0) {      if ((piSplit[i++] = atoi(pchHead)) < 0) {
376          free(piSplit);          free(piSplit);
377          return NULL;          return NULL;
# Line 798  int lscp_param_concat ( char *pszBuffer, Line 802  int lscp_param_concat ( char *pszBuffer,
802  {  {
803      int cchBuffer, cchParam, i;      int cchBuffer, cchParam, i;
804    
805      if (pszBuffer == NULL || pParams == NULL)      if (pszBuffer == NULL)
806          return 0;          return 0;
807    
808      cchBuffer = strlen(pszBuffer);      cchBuffer = strlen(pszBuffer);
809      for (i = 0; pParams[i].key && pParams[i].value; i++) {      for (i = 0; pParams && pParams[i].key && pParams[i].value; i++) {
810          cchParam = strlen(pParams[i].key) + strlen(pParams[i].value) + 4;          cchParam = strlen(pParams[i].key) + strlen(pParams[i].value) + 4;
811          if (cchBuffer + cchParam + 2 < cchMaxBuffer) {          if (cchBuffer + cchParam + 2 < cchMaxBuffer) {
812              sprintf(pszBuffer + cchBuffer, " %s='%s'", pParams[i].key, pParams[i].value);              sprintf(pszBuffer + cchBuffer, " %s='%s'", pParams[i].key, pParams[i].value);

Legend:
Removed from v.180  
changed lines
  Added in v.187

  ViewVC Help
Powered by ViewVC