You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2010/09/30 16:51:24 UTC
svn commit: r1003088 - in /harmony/enhanced/java/branches/java6: ./
classlib/ classlib/depends/libs/ drlvm/ jdktools/
jdktools/modules/samsa/src/main/native/samsa/samsa.c
Author: hindessm
Date: Thu Sep 30 14:51:23 2010
New Revision: 1003088
URL: http://svn.apache.org/viewvc?rev=1003088&view=rev
Log:
Merge change from /harmony/enhanced/java/trunk@1002971:
r1002971 | hindessm | 2010-09-30 10:03:46 +0100 (Thu, 30 Sep 2010) | 1 line
Reduce scope of variables and eliminate unused variables on unix.
Modified:
harmony/enhanced/java/branches/java6/ (props changed)
harmony/enhanced/java/branches/java6/classlib/ (props changed)
harmony/enhanced/java/branches/java6/classlib/depends/libs/ (props changed)
harmony/enhanced/java/branches/java6/drlvm/ (props changed)
harmony/enhanced/java/branches/java6/jdktools/ (props changed)
harmony/enhanced/java/branches/java6/jdktools/modules/samsa/src/main/native/samsa/samsa.c
Propchange: harmony/enhanced/java/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 30 14:51:23 2010
@@ -1,4 +1,4 @@
/harmony/enhanced/java/branches/mrh:935751-941490
-/harmony/enhanced/java/trunk:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736
+/harmony/enhanced/java/trunk:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971
/harmony/enhanced/trunk:476395-929252
/incubator/harmony/enhanced/trunk:292550-476394
Propchange: harmony/enhanced/java/branches/java6/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 30 14:51:23 2010
@@ -1,7 +1,7 @@
/harmony/enhanced/classlib/trunk:713674-735919,765923-926091,926318-926838
/harmony/enhanced/classlib/trunk/working_classlib:884014-884286
/harmony/enhanced/java/branches/mrh/classlib:935751-941490
-/harmony/enhanced/java/trunk/classlib:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736
+/harmony/enhanced/java/trunk/classlib:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971
/harmony/enhanced/trunk/classlib:476395-929252
/harmony/enhanced/trunk/working_classlib:476396-920147
/incubator/harmony/enhanced/trunk/classlib:292550-476394
Propchange: harmony/enhanced/java/branches/java6/classlib/depends/libs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 30 14:51:23 2010
@@ -1,4 +1,4 @@
/harmony/enhanced/classlib/trunk/depends/libs:544451-926091
-/harmony/enhanced/java/trunk/classlib/depends/libs:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736
+/harmony/enhanced/java/trunk/classlib/depends/libs:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971
/harmony/enhanced/trunk/classlib/depends/libs:476395-929252
/incubator/harmony/enhanced/trunk/classlib/depends/libs:292550-476394
Propchange: harmony/enhanced/java/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 30 14:51:23 2010
@@ -1,5 +1,5 @@
/harmony/enhanced/java/branches/mrh/drlvm:935751-941490
-/harmony/enhanced/java/trunk/drlvm:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736
+/harmony/enhanced/java/trunk/drlvm:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971
/harmony/enhanced/trunk/drlvm:476395-929252
/harmony/enhanced/trunk/working_vm:476396-920147
/incubator/harmony/enhanced/trunk/drlvm:292550-476394
Propchange: harmony/enhanced/java/branches/java6/jdktools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 30 14:51:23 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736
+/harmony/enhanced/java/trunk/jdktools:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971
/harmony/enhanced/jdktools/trunk:630107-925933
/harmony/enhanced/trunk/jdktools:476395-929252
/harmony/enhanced/trunk/working_jdktools:476396-920147
Modified: harmony/enhanced/java/branches/java6/jdktools/modules/samsa/src/main/native/samsa/samsa.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/jdktools/modules/samsa/src/main/native/samsa/samsa.c?rev=1003088&r1=1003087&r2=1003088&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/jdktools/modules/samsa/src/main/native/samsa/samsa.c (original)
+++ harmony/enhanced/java/branches/java6/jdktools/modules/samsa/src/main/native/samsa/samsa.c Thu Sep 30 14:51:23 2010
@@ -128,9 +128,7 @@ int main (int argc, char **argv, char **
int moreArgvCount = /* -cp <classpath> */ 2 + /* <tool-class> */ 1 + /* NULL */ 1;
char **myArgv = (char **) malloc(sizeof(char*) * (myArgvCount + moreArgvCount));
char *toolName = NULL;
- char *cmd_line = NULL;
- int size, i, j;
- int cmd_len = 0;
+ int i;
int exit_code = -1;
int newIndex = 0;
char *root = NULL;
@@ -211,6 +209,7 @@ int main (int argc, char **argv, char **
if (strcmp(toolName, "java") && !isJavaw) {
char *classpath;
char *buffer;
+ int size;
myArgvCount = argc + moreArgvCount;
@@ -281,69 +280,75 @@ int main (int argc, char **argv, char **
#if defined(WIN32)
- /*
- * win32 - CreateProcess() needs a cmd line string
- * - double quote all arguments to avoid breaking spaces
- * - prepend existing double quotes with '\'
- */
+ {
+ char *cmd_line = NULL;
+ int cmd_len = 0;
+ int j;
+ int size = 0;
+
+ /*
+ * win32 - CreateProcess() needs a cmd line string
+ * - double quote all arguments to avoid breaking spaces
+ * - prepend existing double quotes with '\'
+ */
- // determine required memory size for command line arguments
- size = 0;
- for (i=1; i < myArgvCount; i++) {
- if (myArgv[i] != NULL) {
- int arg_len = strlen(myArgv[i]);
- size += /* space */ 1 + /* quotes */ 2 + arg_len;
- for (j = 0; j < arg_len; j++) {
- if (myArgv[i][j] == '\"') size++;
+ // determine required memory size for command line arguments
+ for (i=1; i < myArgvCount; i++) {
+ if (myArgv[i] != NULL) {
+ int arg_len = strlen(myArgv[i]);
+ size += /* space */ 1 + /* quotes */ 2 + arg_len;
+ for (j = 0; j < arg_len; j++) {
+ if (myArgv[i][j] == '\"') size++;
+ }
}
}
- }
- // allocate memory for whole command line
- cmd_line = (char *) malloc(strlen(fullExePath) + /* quotes */ 2 + /* arguments */ size + /* NULL */ 1);
+ // allocate memory for whole command line
+ cmd_line = (char *) malloc(strlen(fullExePath) + /* quotes */ 2 + /* arguments */ size + /* NULL */ 1);
- if (cmd_line == NULL) {
- fprintf(stderr, "Unable to allocate memory for tool command line %s\n", argv[0]);
- return 4;
- }
+ if (cmd_line == NULL) {
+ fprintf(stderr, "Unable to allocate memory for tool command line %s\n", argv[0]);
+ return 4;
+ }
- // copy quoted exe path
- sprintf(cmd_line, "\"%s\"", fullExePath);
- cmd_len = strlen(cmd_line);
+ // copy quoted exe path
+ sprintf(cmd_line, "\"%s\"", fullExePath);
+ cmd_len = strlen(cmd_line);
- // copy quoted arguments and prepend existing double quotes with '\'
- for (i=1; i < myArgvCount; i++) {
- if (myArgv[i] != NULL) {
- int arg_len = strlen(myArgv[i]);
- cmd_line[cmd_len++] = ' '; // space delimiter
- cmd_line[cmd_len++] = '\"'; // starting quote
- for (j = 0; j < arg_len; j++) {
- char ch = myArgv[i][j];
- if (ch == '\"') {
- cmd_line[cmd_len++] = '\\';
- }
- cmd_line[cmd_len++] = ch;
+ // copy quoted arguments and prepend existing double quotes with '\'
+ for (i=1; i < myArgvCount; i++) {
+ if (myArgv[i] != NULL) {
+ int arg_len = strlen(myArgv[i]);
+ cmd_line[cmd_len++] = ' '; // space delimiter
+ cmd_line[cmd_len++] = '\"'; // starting quote
+ for (j = 0; j < arg_len; j++) {
+ char ch = myArgv[i][j];
+ if (ch == '\"') {
+ cmd_line[cmd_len++] = '\\';
+ }
+ cmd_line[cmd_len++] = ch;
+ }
+ cmd_line[cmd_len++] = '\"'; // ending quote
}
- cmd_line[cmd_len++] = '\"'; // ending quote
}
- }
- cmd_line[cmd_len] = '\0';
+ cmd_line[cmd_len] = '\0';
- // create child process
- memset(&procInfo, 0, sizeof(PROCESS_INFORMATION));
- memset(&startInfo, 0, sizeof(STARTUPINFO));
- startInfo.cb = sizeof(STARTUPINFO);
+ // create child process
+ memset(&procInfo, 0, sizeof(PROCESS_INFORMATION));
+ memset(&startInfo, 0, sizeof(STARTUPINFO));
+ startInfo.cb = sizeof(STARTUPINFO);
- if (!CreateProcess(NULL, cmd_line, NULL, NULL,
- TRUE, 0, NULL, NULL, &startInfo, &procInfo)) {
+ if (!CreateProcess(NULL, cmd_line, NULL, NULL,
+ TRUE, 0, NULL, NULL, &startInfo, &procInfo)) {
+
+ fprintf(stderr, "Error creating process : %d\n", GetLastError());
+ free(cmd_line);
+ return exit_code;
+ }
- fprintf(stderr, "Error creating process : %d\n", GetLastError());
free(cmd_line);
- return exit_code;
}
- free(cmd_line);
-
// wait for child process to finish
if (!isJavaw && WAIT_FAILED == WaitForSingleObject(procInfo.hProcess, INFINITE)) {
@@ -541,7 +546,6 @@ TOOLDATA *getToolData(const char *toolNa
FILE *fp = NULL;
char key[256];
char value[256];
- int count = 0;
char *temp = NULL;
TOOLDATA *pToolData = NULL;
@@ -587,6 +591,7 @@ TOOLDATA *getToolData(const char *toolNa
free(temp);
if (fp) {
+ int count = 0;
while (EOF != (count = fscanf(fp, "%s = %s\n", key, value))) {
// printf("count = %d : %s = %s\n", count, key, value);