Changeset 3378
- Timestamp:
- Feb 27, 2013 11:44:58 PM (11 years ago)
- Location:
- trunk/packages/vizservers
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/packages/vizservers/nanovis/Command.cpp
r3377 r3378 770 770 } 771 771 #ifdef KEEPSTATS 772 int f; 773 772 774 /* Use the initial client key value pairs as the parts for a generating 773 775 * a unique file name. */ -
trunk/packages/vizservers/nanovis/Makefile.in
r3377 r3378 59 59 LD_RUN_PATH = $(libdir):@LD_RPATH@ 60 60 61 SVN_VERSION = $(shell svnversion )61 SVN_VERSION = $(shell svnversion $(srcdir)) 62 62 63 63 LIBS = \ -
trunk/packages/vizservers/nanovis/nanovis.cpp
r3377 r3378 296 296 #define STATSDIR "/var/tmp/visservers" 297 297 298 static int299 SplitPath(const char *path, int *argcPtr, char ***argvPtr)300 {301 char **array;302 int count;303 char *p;304 char *s;305 size_t addrsize;306 307 count = 0;308 for (p = strchr((char *)path, '/'); p != NULL; p = strchr(p+1, '/')) {309 count++;310 }311 addrsize = (count + 1) * sizeof(char *);312 array = (char **)malloc(addrsize + strlen(path) + 1);313 s = (char *)array + addrsize;314 strcpy(s, path);315 316 count = 0;317 for (p = strtok(s, "/"); p != NULL; p = strtok(NULL, "/")) {318 array[count++] = p;319 }320 *argcPtr = count;321 *argvPtr = array;322 return count;323 }324 325 298 int 326 299 NanoVis::getStatsFile(Tcl_Obj *objPtr) … … 331 304 int i; 332 305 char fileName[33]; 306 const char *path; 333 307 md5_state_t state; 334 308 md5_byte_t digest[16]; 335 309 char *string; 310 int length; 336 311 337 312 if (objPtr == NULL) { … … 354 329 Tcl_DStringAppend(&ds, STATSDIR, -1); 355 330 Tcl_DStringAppend(&ds, "/", 1); 356 Tcl_DStringAppend(&ds mfileName, 32);331 Tcl_DStringAppend(&ds, fileName, 32); 357 332 path = Tcl_DStringValue(&ds); 358 333 -
trunk/packages/vizservers/pymolproxy/Makefile.in
r3377 r3378 7 7 DEFINES = -DSTANDALONE 8 8 EXTRA_CFLAGS = -Wall 9 INCLUDES = $(TCL_INC_SPEC) 9 INCLUDES = $(TCL_INC_SPEC) -I$(srcdir) 10 10 TCL_INC_SPEC = @TCL_INC_SPEC@ 11 11 TCL_LIB_SPEC = @TCL_LIB_SPEC@ -
trunk/packages/vizservers/pymolproxy/pymolproxy2.c
r3377 r3378 595 595 Tcl_DStringInit(&ds); 596 596 Tcl_DStringAppend(&ds, string, -1); 597 Tcl_DStringAppendElement(&ds, "pid" , 3);597 Tcl_DStringAppendElement(&ds, "pid"); 598 598 sprintf(pidstr, "%d", getpid()); 599 Tcl_DStringAppendElement(&ds, pidstr , -1);599 Tcl_DStringAppendElement(&ds, pidstr); 600 600 601 601 /* Create a md5 hash of the key/value pairs and use it as the file name. */ … … 608 608 sprintf(fileName + i * 2, "%02x", digest[i]); 609 609 } 610 Tcl_DString Length(&ds, 0);610 Tcl_DStringSetLength(&ds, 0); 611 611 Tcl_DStringAppend(&ds, STATSDIR, -1); 612 612 Tcl_DStringAppend(&ds, "/", 1); … … 645 645 Tcl_DString ds; 646 646 int result; 647 int f; 647 648 648 649 {
Note: See TracChangeset
for help on using the changeset viewer.