diff options
author | Danny Roberts <dannyroberts.personal@googlemail.com> | 2011-02-18 10:30:50 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2011-02-18 10:30:50 +0100 |
commit | b7b0250d8365450b766b2f1ac607cce446b6fa20 (patch) | |
tree | c837845e43dbb4c61d5e8f235b095d1498627c98 | |
parent | configure inclusion/exclusion of scripting providers (diff) | |
download | core-b7b0250d8365450b766b2f1ac607cce446b6fa20.tar.gz core-b7b0250d8365450b766b2f1ac607cce446b6fa20.zip |
Removed some commented code.
-rwxr-xr-x | solenv/bin/build_client.pl | 9 | ||||
-rwxr-xr-x | solenv/bin/cleanzip.pl | 5 | ||||
-rw-r--r-- | solenv/bin/clipatchconfig.pl | 2 | ||||
-rwxr-xr-x | solenv/bin/deliver.pl | 1 | ||||
-rwxr-xr-x | solenv/bin/gen_userfeedback_VCL_names.pl | 1 | ||||
-rw-r--r-- | solenv/bin/make_download.pl | 3 | ||||
-rw-r--r-- | solenv/bin/make_installer.pl | 18 | ||||
-rw-r--r-- | solenv/bin/makemani.pl | 1 | ||||
-rw-r--r-- | solenv/bin/mhids.pl | 14 | ||||
-rwxr-xr-x | solenv/bin/mkdocs.sh | 1 | ||||
-rw-r--r-- | solenv/bin/modules/GenInfoParser.pm | 3 | ||||
-rw-r--r-- | solenv/bin/modules/RepositoryHelper.pm | 2 | ||||
-rwxr-xr-x | soltools/HIDCompiler/hidclex.l | 2 | ||||
-rw-r--r-- | soltools/cpp/_macro.c | 21 | ||||
-rw-r--r-- | soltools/cpp/_mcrvalid.c | 22 | ||||
-rw-r--r-- | soltools/cpp/_tokens.c | 2 | ||||
-rw-r--r-- | soltools/cpp/cpp.h | 9 | ||||
-rw-r--r-- | soltools/giparser/gi_parse.cxx | 11 | ||||
-rw-r--r-- | soltools/ldump/hashtbl.cxx | 13 | ||||
-rw-r--r-- | soltools/ldump/ldump.cxx | 3 | ||||
-rw-r--r-- | soltools/mkdepend/collectdircontent.cxx | 1 | ||||
-rw-r--r-- | soltools/mkdepend/collectdircontent.hxx | 4 | ||||
-rw-r--r-- | soltools/mkdepend/main.c | 1 | ||||
-rw-r--r-- | soltools/mkdepend/parse.c | 2 | ||||
-rw-r--r-- | soltools/testSHL/inc/tlog.hxx | 2 |
25 files changed, 4 insertions, 149 deletions
diff --git a/solenv/bin/build_client.pl b/solenv/bin/build_client.pl index 54a5c4f84de2..f518f8198dcc 100755 --- a/solenv/bin/build_client.pl +++ b/solenv/bin/build_client.pl @@ -59,7 +59,6 @@ my $processes_to_run = 1; my %hosts_ports = (); my $default_port = 7890; my @ARGV_COPY = @ARGV; # @ARGV BACKUP -#$ARGV_COPY{$_}++ foreach (@ARGV); print "arguments: @ARGV\n"; get_options(); @@ -149,7 +148,6 @@ sub run_client { # "active" cycle foreach my $active_server (keys %active_servers) { foreach my $active_port (keys %{$active_servers{$active_server}}) { -# print "Active: $active_server:$active_port\n"; my $iaddr = inet_aton($active_server); $paddr = sockaddr_in($active_port, $iaddr); do { @@ -172,7 +170,6 @@ sub run_client { }; # "inactive" cycle -# print "Inactive: $current_server:$current_port\n"; my $iaddr = inet_aton($current_server); $paddr = sockaddr_in($current_port, $iaddr); do { @@ -275,7 +272,7 @@ sub request_job { $message = "platform=$ENV_BACKUP{OUTPATH} pid=$$ osname=$^O" if (!$message); # create the socket, connect to the port socket(SOCKET, PF_INET, SOCK_STREAM, $proto) or die "socket: $!"; - connect(SOCKET, $paddr) or return '';#die "connect: $!"; + connect(SOCKET, $paddr) or return ''; my $error_code = 1; $message .= "\n"; syswrite SOCKET, $message, length $message; @@ -373,8 +370,6 @@ sub do_job { getcwd(); my $job_string = $job_hash{job} . ' > ' . $tmp_log_file . ' 2>&1'; $error_code = system($job_string); -# rename($tmp_log_file, $job_hash{log}) or system("mv", $tmp_log_file, $job_hash{log}); -# delete $job_temp_files{$tmp_log_file};# = $job_hash{log}; }; rename($tmp_log_file, $job_hash{log}) or system("mv", $tmp_log_file, $job_hash{log}); delete $job_temp_files{$tmp_log_file}; @@ -417,7 +412,7 @@ sub print_error { exit(1); }; sub store_env_hash { - my $ss_setenv_file = shift;#($$job_hash{server_pid}.$$job_hash{setsolar_cmd}, $cmd_file); + my $ss_setenv_file = shift; my %solar_vars = (); my $cmd_file = File::Temp::tmpnam($ENV_BACKUP{TMP}); my $env_vars_file = File::Temp::tmpnam($ENV_BACKUP{TMP}); diff --git a/solenv/bin/cleanzip.pl b/solenv/bin/cleanzip.pl index 8103a13945b1..5e1502b76611 100755 --- a/solenv/bin/cleanzip.pl +++ b/solenv/bin/cleanzip.pl @@ -46,16 +46,11 @@ unless ( $zip->read( $filename ) == AZ_OK ) { my @members = $zip ->members(); foreach my $member ( @members ) { -# printf ( "%o\n",$member->unixFileAttributes()); -# printf ( "%o\n",$member->unixFileAttributes() & 0b111111111111); my $attribs = $member->unixFileAttributes(); if ( $member->isDirectory ) { $attribs = $attribs & 0b101111111111; $member->unixFileAttributes($attribs) } -# printf ( "%o\n",$member->unixFileAttributes()); -# printf ( "%o\n",$member->unixFileAttributes() & 0b111111111111); -# print ( $member->fileName()."\n"); } unless ( $zip->writeToFileNamed( ${filename}."_new" ) == AZ_OK ) { die "$0: ERROR reading ${filename}_new\n"; diff --git a/solenv/bin/clipatchconfig.pl b/solenv/bin/clipatchconfig.pl index 365e0bb14950..49fecd9e8b41 100644 --- a/solenv/bin/clipatchconfig.pl +++ b/solenv/bin/clipatchconfig.pl @@ -27,7 +27,6 @@ use warnings; use strict; -# use diagnostics; sub trim; sub readRedirectionValues($); @@ -52,7 +51,6 @@ if (scalar @ARGV < 3) { my %redirectionValue = readRedirectionValues($ARGV[1]); -#print "|$_| |$redirectionValue{$_}|\n", for keys %redirectionValue; #Read config file in which we will replace the versions diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl index 08a7806b3cc7..898dd97a1dc7 100755 --- a/solenv/bin/deliver.pl +++ b/solenv/bin/deliver.pl @@ -268,7 +268,6 @@ sub do_linklib } else { - # $lib =~ /^(lib[\w-]+(\.so|\.dylib))\.(\d+)$/; $long = 0; } diff --git a/solenv/bin/gen_userfeedback_VCL_names.pl b/solenv/bin/gen_userfeedback_VCL_names.pl index 2b7f59d7775f..5cfb5d4c7f9d 100755 --- a/solenv/bin/gen_userfeedback_VCL_names.pl +++ b/solenv/bin/gen_userfeedback_VCL_names.pl @@ -131,7 +131,6 @@ foreach ( glob("$winpath/*win") ) { } $iteminfo = "$shortname $longname $ID"; -# print "$iteminfo\n" if ( ! ( $shortname && $longname && $ID )); $iteminfo =~ s/^\*//; $iteminfo =~ s/^\+//; diff --git a/solenv/bin/make_download.pl b/solenv/bin/make_download.pl index dd492ea3bfa1..62d8888bc383 100644 --- a/solenv/bin/make_download.pl +++ b/solenv/bin/make_download.pl @@ -68,9 +68,6 @@ foreach my $infofilename ( @{$infofilelist} ) installer::logger::print_message( "... WARNING: Signing only for Windows platforms active ...\n" ); } - # installer::logger::include_header_into_logfile("Reading include pathes"); - # installer::worker::collect_all_files_from_includepathes($followmeinfohash->{'includepatharray'}); - if (( $installer::globals::iswindowsbuild ) && ( $installer::globals::dosign )) { $followmeinfohash->{'finalinstalldir'} = installer::windows::sign::sign_install_set($followmeinfohash, $do_copy, $temppath); diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl index 17a451594baf..ff96cd45bd25 100644 --- a/solenv/bin/make_installer.pl +++ b/solenv/bin/make_installer.pl @@ -511,9 +511,6 @@ installer::logger::print_message( "... analyzing unix links ... \n" ); my $unixlinksinproductarrayref = installer::setupscript::get_all_items_from_script($setupscriptref, "Unixlink"); if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "unixlinks1.log", $unixlinksinproductarrayref); } -# $unixlinksinproductarrayref = installer::scriptitems::filter_layerlinks_from_unixlinks($unixlinksinproductarrayref); -# if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "unixlinks1b.log", $unixlinksinproductarrayref); } - installer::logger::print_message( "... analyzing profile ... \n" ); my $profilesinproductarrayref = installer::setupscript::get_all_items_from_script($setupscriptref, "Profile"); @@ -966,9 +963,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) ($directoriesforepmarrayref, $alldirectoryhash) = installer::scriptitems::collect_directories_with_create_flag_from_directoryarray($dirsinproductlanguageresolvedarrayref, $alldirectoryhash); if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforepmlist2.log", $directoriesforepmarrayref); } - # installer::sorter::sorting_array_of_hashes($directoriesforepmarrayref, "HostName"); - # if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforepmlist3.log", $directoriesforepmarrayref); } - ######################################################### # language dependent scpactions part ######################################################### @@ -1146,7 +1140,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) installer::scriptitems::changing_name_of_language_dependent_keys($modulesinproductlanguageresolvedarrayref); if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes_modules($loggingdir . "modules3a.log", $modulesinproductlanguageresolvedarrayref); } - # installer::scriptitems::collect_language_specific_names($modulesinproductlanguageresolvedarrayref); installer::scriptitems::select_required_language_strings($modulesinproductlanguageresolvedarrayref); # using english strings } @@ -1346,8 +1339,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) my $listfiledir = installer::systemactions::create_directories("listfile", $languagestringref); my $installlogdir = installer::systemactions::create_directory_next_to_directory($installdir, "log"); - # installer::packagelist::add_defaultpathes_into_filescollector($filesinproductlanguageresolvedarrayref); - # my $installchecksumdir = installer::systemactions::create_directory_next_to_directory($installdir, "checksum"); #################################################### # Reading for Solaris all package descriptions @@ -1576,7 +1567,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) { # special handling for all RPMs in $installer::globals::linuxlinkrpms - # if (( $installer::globals::linuxlinkrpms =~ /\b$onepackagename\b/ ) || ( $installer::globals::languagepack )) if ( $installer::globals::linuxlinkrpms =~ /\b$onepackagename\b/ ) { my $run = 0; @@ -1691,7 +1681,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) installer::epmfile::resolve_path_in_epm_list_before_packaging(\@epmfile, $completeepmfilename, "PRODUCTDIRECTORYNAME", $staticpath); installer::epmfile::resolve_path_in_epm_list_before_packaging(\@epmfile, $completeepmfilename, "SOLSUREPACKAGEPREFIX", $allvariableshashref->{'SOLSUREPACKAGEPREFIX'}); installer::epmfile::resolve_path_in_epm_list_before_packaging(\@epmfile, $completeepmfilename, "UREPACKAGEPREFIX", $allvariableshashref->{'UREPACKAGEPREFIX'}); - # installer::epmfile::resolve_path_in_epm_list_before_packaging(\@epmfile, $completeepmfilename, "BASISDIRECTORYVERSION", $allvariableshashref->{'OOOBASEVERSION'}); installer::files::save_file($completeepmfilename ,\@epmfile); ####################################################### @@ -1775,7 +1764,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) $installer::globals::postprocess_specialepm = 1; # solaris patch not needed anymore - # if (( $installer::globals::patch ) && ( $installer::globals::issolarisx86build )) { installer::worker::fix2_solaris_x86_patch($packagename, $installer::globals::epmoutpath); } } } else # this is the standard epm (not relocatable) or ( nonlinux and nonsolaris ) @@ -1845,7 +1833,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) if ( $installer::globals::addsystemintegration ) { installer::epmfile::put_systemintegration_into_installset($installer::globals::epmoutpath, $includepatharrayref, $allvariableshashref, $modulesinproductarrayref); } # Adding license and readme into installation set - # if ($installer::globals::addlicensefile) { installer::epmfile::put_installsetfiles_into_installset($installer::globals::epmoutpath); } if ($installer::globals::addlicensefile) { installer::worker::put_scpactions_into_installset("."); } # Adding child projects to installation dynamically @@ -1889,7 +1876,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) if ( $installer::globals::addsystemintegration ) { installer::epmfile::put_systemintegration_into_installset($newepmdir, $includepatharrayref, $allvariableshashref, $modulesinproductarrayref); } # Adding license and readme into installation set - # if ($installer::globals::addlicensefile) { installer::epmfile::put_installsetfiles_into_installset($newepmdir); } if ($installer::globals::addlicensefile) { installer::worker::put_scpactions_into_installset("."); } # Adding license file into setup @@ -1998,13 +1984,11 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) my $idtdirbase = installer::systemactions::create_directories("idt_files", $languagestringref); $installer::globals::infodirectory = installer::systemactions::create_directories("info_files", $languagestringref); my $installlogdir = installer::systemactions::create_directory_next_to_directory($installdir, "log"); - # my $installchecksumdir = installer::systemactions::create_directory_next_to_directory($installdir, "checksum"); ################################################################################# # Preparing cabinet files from package definitions ################################################################################# - # installer::packagelist::prepare_cabinet_files($packages, $allvariableshashref, $$languagestringref); installer::packagelist::prepare_cabinet_files($packages, $allvariableshashref); # printing packages content: installer::packagelist::log_cabinet_assignments(); @@ -2276,7 +2260,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) # validating the database # ToDo my $languagefile = installer::files::read_file($installer::globals::idtlanguagepath . $installer::globals::separator . "SIS.mlf"); - # my $languagefile = installer::files::read_file($installer::globals::idtlanguagepath . $installer::globals::separator . "SIS.ulf"); installer::windows::msiglobal::write_summary_into_msi_database($msifilename, $onelanguage, $languagefile, $allvariableshashref); @@ -2319,7 +2302,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) installer::logger::print_message( "... copying files into installation set ...\n" ); - # installer::windows::msiglobal::copy_scpactions_into_installset($defaultlanguage, $installdir, $scpactionsinproductlanguageresolvedarrayref); installer::worker::put_scpactions_into_installset($installdir); # ... copying the setup.exe diff --git a/solenv/bin/makemani.pl b/solenv/bin/makemani.pl index cdebaab77617..7575d07e688b 100644 --- a/solenv/bin/makemani.pl +++ b/solenv/bin/makemani.pl @@ -50,7 +50,6 @@ sub wanted; sub wanted { /^.*\.xc(s|u)\z/s && ( push @findlist, $name ); -# && ( push @findlist, $name ) && print("$name\n"); } sub usage diff --git a/solenv/bin/mhids.pl b/solenv/bin/mhids.pl index 33f873bc386d..a1325032849c 100644 --- a/solenv/bin/mhids.pl +++ b/solenv/bin/mhids.pl @@ -59,7 +59,6 @@ sub cleandie print STDERR "$errstring\n"; if ( not $debug ) { foreach my $i (@cleanuplist) { -# unlink "$workfile$i" if -f "$workfile$i" or print STDERR "ERROR - couldn't remove $workfile$i\n"; if ( -f "$workfile$i" ) { unlink "$workfile$i" or print STDERR "ERROR - couldn't remove $workfile$i\n"; } @@ -161,7 +160,6 @@ $flbs =~ s/[aeiou]//g; # call srand ony once per script! srand(); $workfile = "$tmpdir/${flbs}_".$$.rand(); -#$workfile =~ s/setup/set_up/; # now get $workfile ready for shell usage... $shell_workfile = $workfile; @@ -172,7 +170,6 @@ print "workfile: $workfile\n" if $verbose; unlink "$workfile.obj"; # can't do this for modules with mixed case! -#$prjname =~ lc $prjname; if ( -f "$workfile.hid" ) { @@ -194,9 +191,6 @@ if ( defined $ENV{"NO_HID_FILES"} ) { } } -#echo "perl5 -p -e "s/=[ \t]*\".*\"/=\"\"/go; s/\".*\"[ \t]*;/\"\" ;/go ; s/(\".*)\/\/(.*\")/$1\/\\\/$2/go ;" < %filename% > %srs%\%workfile%.c0" -#call perl5 -p -e "s/=[ \t]*\".*\"/=\"\"/go; s/\".*\"[ \t]*;/\"\" ;/go ; s/(\".*)\/\/(.*\")/$1\/\\\/$2/go ;" < %filename% > %srs%\%workfile%.c0 - my $verboseSwitch = $verbose ? "-verbose" : ""; print "$ENV{SOLARBINDIR}/hidc $verboseSwitch $filename ${shell_workfile}.c1 $prjname\n" if $verbose; $ret = system "$ENV{SOLARBINDIR}/hidc $verboseSwitch $filename ${shell_workfile}.c1 $prjname"; @@ -279,7 +273,6 @@ while (<C3>) @arr = split /:/, $fields[0]; if( $arr[1] =~ /^leer$|^bitmap$|^font$|^color$|^image$|^imagelist$|^date$|^brush$|^fixedtext$|^keycode$|^time$|^mapmode$/i ) { - #print "skipping $arr[1]\n"; next; } @@ -292,11 +285,6 @@ while (<C3>) $LClass = lc($fields[4]); $LID = $fields[5] || 0; - #print $LID - #print $LClass - #print $GID - #print $GClass - $nHID=0; $VAL1 = 536870912; #2 hoch 29 @@ -310,7 +298,6 @@ while (<C3>) else { $nHID=0; $outline = "No GClass ".$helpIDString." ".$nHID." ".$GClass; - #print "$outline\n"; next; } if( $LID != 0 ) { @@ -343,7 +330,6 @@ while (<C3>) else { $nHID=0; $outline = "No LClass ".$helpIDString." ".$nHID; - #print "$outline\n"; next; } diff --git a/solenv/bin/mkdocs.sh b/solenv/bin/mkdocs.sh index 0cbe61bc6fee..3d6ba295c893 100755 --- a/solenv/bin/mkdocs.sh +++ b/solenv/bin/mkdocs.sh @@ -26,7 +26,6 @@ BINDIR=`dirname $0` . ./*.Set.sh # get list of modules in build order - bah, blows RAM & disk, static list below -#INPUT_PROJECTS=`build --all --show | sed -n -e '/Entering module/ s/Entering module // p'` INPUT_PROJECTS="o3tl basegfx basebmp comphelper svl vcl canvas cppcanvas oox svtools goodies drawinglayer xmloff slideshow sfx2 editeng svx cui chart2 dbaccess sd starmath sc sw" # output directory for generated documentation diff --git a/solenv/bin/modules/GenInfoParser.pm b/solenv/bin/modules/GenInfoParser.pm index 2671da13a69d..fdab7e44ff17 100644 --- a/solenv/bin/modules/GenInfoParser.pm +++ b/solenv/bin/modules/GenInfoParser.pm @@ -128,10 +128,7 @@ sub parse_list return 0 if ! -r $list_file; open(FILE, "<$list_file") or croak("can't open $list_file: $!"); - # my $t0 = new Benchmark; $self->parse_block(\*FILE, $self->{'DATA'}); - # my $t1 = new Benchmark; - # print STDERR "parsing $list_file took: ", timestr(timediff($t1, $t0)), "\n"; close(FILE); } diff --git a/solenv/bin/modules/RepositoryHelper.pm b/solenv/bin/modules/RepositoryHelper.pm index 9f7bb869e42d..31c97e35d1c2 100644 --- a/solenv/bin/modules/RepositoryHelper.pm +++ b/solenv/bin/modules/RepositoryHelper.pm @@ -122,7 +122,7 @@ sub search_via_build_lst { my $previous_dir = ''; my $rep_root_candidate = $self->{INITIAL_DIRECTORY}; do { - foreach (@possible_build_lists) {# ('build.lst', 'build.xlist'); + foreach (@possible_build_lists) { if (-e $rep_root_candidate . '/prj/'.$_) { $self->{REPOSITORY_ROOT} = File::Basename::dirname($rep_root_candidate); return 1; diff --git a/soltools/HIDCompiler/hidclex.l b/soltools/HIDCompiler/hidclex.l index e99618f30225..8067d7db93f3 100755 --- a/soltools/HIDCompiler/hidclex.l +++ b/soltools/HIDCompiler/hidclex.l @@ -200,12 +200,10 @@ char* listfilename; char* filename_tab[MAXSRCFILES]; char* project_tab[MAXSRCFILES]; int tab_entries = 0; -//int fileno = 0; /* currently used filenumber */ /* globale variablen */ FILE* outfile; char const *filename = ""; //incl. path -//char *basename = ""; char const *project = ""; char const *subpath = ""; //from project name downwards like source\ui\xxx.src diff --git a/soltools/cpp/_macro.c b/soltools/cpp/_macro.c index 63aa7ecf40bd..294606524864 100644 --- a/soltools/cpp/_macro.c +++ b/soltools/cpp/_macro.c @@ -289,7 +289,6 @@ void void expand(Tokenrow * trp, Nlist * np, MacroValidatorList * pValidators) { -// Token * pOldNextTp; Tokenrow ntr; int ntokc, narg; Tokenrow *atr[NARG + 1]; @@ -340,32 +339,12 @@ void } } -/* old - np->flag |= ISACTIVE; -*/ - -/* rh -*/ doconcat(&ntr); /* execute ## operators */ ntr.tp = ntr.bp; makespace(&ntr, trp->tp); -/* old -// expandrow(&ntr, "<expand>"); -// insertrow(trp, ntokc, &ntr); -// dofree(ntr.bp); -// np->flag &= ~ISACTIVE; -*/ - -/* NP - // Replace macro by its value: -*/ -// pOldNextTp = trp->tp+ntokc; tokenrow_zeroTokenIdentifiers(&ntr); insertrow(trp, ntokc, &ntr); - /* Reassign old macro validators: - */ -// mvl_move(pValidators, trp->tp - pOldNextTp); /* add validator for just invalidated macro: */ diff --git a/soltools/cpp/_mcrvalid.c b/soltools/cpp/_mcrvalid.c index 29bd33fc0885..446f86d316d1 100644 --- a/soltools/cpp/_mcrvalid.c +++ b/soltools/cpp/_mcrvalid.c @@ -5,13 +5,6 @@ #include "cpp.h" -/* - Nlist * pMacro; - Token * pTokenWhereMacroBecomesValid; - struct macroValidator * - pNext; -*/ - void mvl_init(MacroValidatorList * out_pValidators) { @@ -70,21 +63,6 @@ mvl_add( MacroValidatorList * inout_pValidators, inout_pValidators->pFirst = pNew; } -/* -void -mvl_move( MacroValidatorList * inout_pValidators, - int in_nSpace ) -{ - MacroValidator * pV; - for ( pV = inout_pValidators->pFirst; - pV != 0; - pV = pV->pNext ) - { - pV->pTokenWhereMacroBecomesValid += in_nSpace; - } -} -*/ - void mvl_check( MacroValidatorList * inout_pValidators, Token * inout_pTokenToCheck) diff --git a/soltools/cpp/_tokens.c b/soltools/cpp/_tokens.c index 00849d9006c2..8be4a85d3ba9 100644 --- a/soltools/cpp/_tokens.c +++ b/soltools/cpp/_tokens.c @@ -276,7 +276,6 @@ void { size_t nby; - /* nby = sizeof(Token) * (str->lp - str->bp); */ nby = (char *) str->lp - (char *) str->bp; memmove(dtr->tp, str->bp, nby); } @@ -297,7 +296,6 @@ void size = (trp->lp - trp->bp) + nt; while (size > trp->max) growtokenrow(trp); - /* nby = sizeof(Token) * (trp->lp - trp->tp); */ nby = (char *) trp->lp - (char *) trp->tp; if (nby) memmove(trp->tp + nt, trp->tp, nby); diff --git a/soltools/cpp/cpp.h b/soltools/cpp/cpp.h index efba26b60840..b85d28e0584e 100644 --- a/soltools/cpp/cpp.h +++ b/soltools/cpp/cpp.h @@ -144,16 +144,7 @@ void mvl_add( inout_pValidators, Nlist * in_pMacro, Token * in_pTokenWhereMacroBecomesValid); -/* Updates all token pointers within the list, when the tokens have - moved, by - pTokenWhereMacroBecomesValid += in_nNrofTokens; - . -void mvl_move( - MacroValidatorList * - inout_pValidators, - int in_nSpace); // in pointer units. -*/ /* Checks if one of the validators within the list points to the token in_pTokenToCheck. If so, the macro is set valid and the validator is removed. diff --git a/soltools/giparser/gi_parse.cxx b/soltools/giparser/gi_parse.cxx index 0b469143b4f1..5ee68af64d7b 100644 --- a/soltools/giparser/gi_parse.cxx +++ b/soltools/giparser/gi_parse.cxx @@ -69,7 +69,6 @@ GenericInfo_Parser::GenericInfo_Parser() nCurLine(0), nLevel(0), bGoon(false), - // sCurComment, eErrorCode(ok), nErrorLine(0), pResult(0), @@ -319,18 +318,8 @@ GenericInfo_Parser::WriteList( ostream & o_rFile ) { PushLevel_Write(); -/* - WriteIndentation(); - o_rFile.write("{",1); - o_rFile.write(C_sLineEnd, C_nLineEndLength); -*/ WriteList(o_rFile); -/* - WriteIndentation(); - o_rFile.write("}",1); - o_rFile.write(C_sLineEnd, C_nLineEndLength); -*/ PopLevel_Write(); } } // end for diff --git a/soltools/ldump/hashtbl.cxx b/soltools/ldump/hashtbl.cxx index 40b153d84d58..712357f3a7fe 100644 --- a/soltools/ldump/hashtbl.cxx +++ b/soltools/ldump/hashtbl.cxx @@ -101,19 +101,6 @@ HashTable::~HashTable() // Problem: Virtuelle Funktionen sind im Destructor nicht virtuell!! // Der Code muß deshalb ins Macro - /* - if (m_bOwner) - { - for (ULONG i=0; i<GetSize(); i++) - { - void *pObject = GetObjectAt(i); - - if (pObject != NULL) - OnDeleteObject(pObject()); - } - } - */ - // Speicher für HashItems freigeben delete [] m_pData; } diff --git a/soltools/ldump/ldump.cxx b/soltools/ldump/ldump.cxx index d85022495ee1..ebe6983e18be 100644 --- a/soltools/ldump/ldump.cxx +++ b/soltools/ldump/ldump.cxx @@ -165,7 +165,6 @@ bool LibDump::Dump() *pEnd = '\0'; strncpy( aBuf, pFound, strlen( pFound)); aBuf[ strlen( pFound) ] = '\0'; -// fprintf( stderr, "\n--- %s\n", aBuf); break; } else @@ -211,7 +210,6 @@ bool LibDump::Dump() nName++; } } - //fprintf( stderr, "Gefundenen Prefix : %s %d \n", aTmpBuf, nPreLen ); // den ersten _ raus nLen = (int) strlen(aName); #ifndef _WIN64 @@ -580,7 +578,6 @@ LibDump::~LibDump() { delete [] cBName; delete [] cAPrefix; -// delete [] cLibName; delete [] cFilterName; delete [] cModName; } diff --git a/soltools/mkdepend/collectdircontent.cxx b/soltools/mkdepend/collectdircontent.cxx index 60654bd41ce6..884456a382c9 100644 --- a/soltools/mkdepend/collectdircontent.cxx +++ b/soltools/mkdepend/collectdircontent.cxx @@ -66,7 +66,6 @@ bool IncludesCollection::exists(string filePath) { } else { return true; }; - //return false; }; extern "C" { diff --git a/soltools/mkdepend/collectdircontent.hxx b/soltools/mkdepend/collectdircontent.hxx index e8f59476c260..0c6b42357855 100644 --- a/soltools/mkdepend/collectdircontent.hxx +++ b/soltools/mkdepend/collectdircontent.hxx @@ -28,8 +28,6 @@ typedef pair<string, string> PathFilePair; struct IncludesCollection { private: DirMap allIncludes; -// bool search(string filePath); -// bool add_dir(string dirPath); PathFilePair split_path(const string& filePath); void add_to_collection(const string& dirPath); @@ -56,6 +54,6 @@ int call_IncludesCollection_exists(struct IncludesCollection* m, const char* fil } #endif -#endif // COLLECTDIRCONTENT_H +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/soltools/mkdepend/main.c b/soltools/mkdepend/main.c index d63764df5eb2..bddeeba988cc 100644 --- a/soltools/mkdepend/main.c +++ b/soltools/mkdepend/main.c @@ -351,7 +351,6 @@ int main(argc, argv) break; default: if (endmarker) break; - /* fatalerr("unknown opt = %s\n", argv[0]); */ warning("ignoring option %s\n", argv[0]); } } diff --git a/soltools/mkdepend/parse.c b/soltools/mkdepend/parse.c index 8a9fb6b2ea40..a63e481b6cdd 100644 --- a/soltools/mkdepend/parse.c +++ b/soltools/mkdepend/parse.c @@ -420,14 +420,12 @@ static int hash( str ) { /* Hash (Kernighan and Ritchie) */ register unsigned int hashval = 0; - //char *s = str; for ( ; *str; str++ ) { hashval = ( hashval * SYMHASHSEED ) + ( *str ); } - //fprintf( stderr, "hash: %s, %d\n", s, hashval & ( SYMHASHMEMBERS - 1 ) ); return hashval & ( SYMHASHMEMBERS - 1 ); } diff --git a/soltools/testSHL/inc/tlog.hxx b/soltools/testSHL/inc/tlog.hxx index c71cc7481825..fa38483efd38 100644 --- a/soltools/testSHL/inc/tlog.hxx +++ b/soltools/testSHL/inc/tlog.hxx @@ -37,10 +37,8 @@ using namespace std; -// <namespace_tstutl> namespace tstutl { -// <class_tLog> class tLog { // <private_members> |