diff options
author | Panu Matilainen <pmatilai@redhat.com> | 2010-09-21 15:02:43 +0300 |
---|---|---|
committer | Panu Matilainen <pmatilai@redhat.com> | 2010-09-21 15:02:43 +0300 |
commit | 7e53dc6ee11a2af50dc8d2c3cb132e7e69aaff18 (patch) | |
tree | 01ddb9e22314da867a8a2d3eb9969f154e008b82 /tools | |
parent | b9cd5a5e746d1bb0da5d6ccef8d83e7867569168 (diff) | |
download | rpm-7e53dc6ee11a2af50dc8d2c3cb132e7e69aaff18.tar.gz |
Avoid stepping on toes of relatives, part 2
- Eliminate uses of "class" which is a reserved keyword in C++
Diffstat (limited to 'tools')
-rw-r--r-- | tools/javadeps.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/javadeps.c b/tools/javadeps.c index d1dcb8b81..9d15787e9 100644 --- a/tools/javadeps.c +++ b/tools/javadeps.c @@ -985,7 +985,7 @@ char* findClassName (FILE *fileHandle, symbolTable_t *symbolTable) { char ignore[10]; unsigned short type = 0; - unsigned short class = 0; + unsigned short jclass = 0; char *className; /* seek a little past the end of the table */ @@ -996,13 +996,13 @@ findClassName (FILE *fileHandle, symbolTable_t *symbolTable) { my_fread(&type, 2, 1, fileHandle); type=ntohs(type); - class = symbolTable->classRef[type]; - if( !class || - !symbolTable->stringList[class] ) { - die("Couln't find class: %d, provided by file.\n", class); + jclass = symbolTable->classRef[type]; + if( !jclass || + !symbolTable->stringList[jclass] ) { + die("Couln't find class: %d, provided by file.\n", jclass); } - className=symbolTable->stringList[class]; + className=symbolTable->stringList[jclass]; return className; |