From f56c804e86f8d6f5aa963a5304dc1e40461d8170 Mon Sep 17 00:00:00 2001 From: sponge Date: Tue, 30 Oct 2012 11:03:11 +0000 Subject: [PATCH] cleanups as requested --- Slackware/i2p/i2p.SlackBuild | 2 +- .../i2p/BOB/Demos/echo/echoclient/Main.java | 14 ++---- .../i2p/BOB/Demos/echo/echoserver/Main.java | 14 ++---- apps/BOB/src/net/i2p/BOB/BOB.java | 12 +---- apps/BOB/src/net/i2p/BOB/DoCMDS.java | 12 +---- apps/BOB/src/net/i2p/BOB/I2Plistener.java | 12 +---- apps/BOB/src/net/i2p/BOB/I2PtoTCP.java | 12 +---- apps/BOB/src/net/i2p/BOB/Lifted.java | 12 +---- apps/BOB/src/net/i2p/BOB/MUXlisten.java | 46 ++++++++----------- apps/BOB/src/net/i2p/BOB/Main.java | 12 +---- apps/BOB/src/net/i2p/BOB/NamedDB.java | 12 +---- apps/BOB/src/net/i2p/BOB/TCPio.java | 12 +---- apps/BOB/src/net/i2p/BOB/TCPlistener.java | 12 +---- apps/BOB/src/net/i2p/BOB/TCPtoI2P.java | 14 ++---- apps/BOB/src/net/i2p/BOB/UDPIOthread.java | 12 +---- .../i2ptunnel/I2PTunnelHTTPBidirProxy.java | 13 +----- history.txt | 3 ++ 17 files changed, 54 insertions(+), 172 deletions(-) diff --git a/Slackware/i2p/i2p.SlackBuild b/Slackware/i2p/i2p.SlackBuild index 07c91659c0..325f19c846 100755 --- a/Slackware/i2p/i2p.SlackBuild +++ b/Slackware/i2p/i2p.SlackBuild @@ -128,7 +128,7 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG # -# requiredbuilder fucks up REALLY bad, and thinks java is perl?! +# requiredbuilder messes up REALLY bad, and thinks java is perl?! # It also did not catch the shell requirements! BOOOOOOOOOOO! HISSSSSSSS! # # requiredbuilder -v -y -s $CWD $PKG diff --git a/apps/BOB/Demos/echo/echoclient/src/net/i2p/BOB/Demos/echo/echoclient/Main.java b/apps/BOB/Demos/echo/echoclient/src/net/i2p/BOB/Demos/echo/echoclient/Main.java index d3398caaac..ca7b828890 100644 --- a/apps/BOB/Demos/echo/echoclient/src/net/i2p/BOB/Demos/echo/echoclient/Main.java +++ b/apps/BOB/Demos/echo/echoclient/src/net/i2p/BOB/Demos/echo/echoclient/Main.java @@ -1,17 +1,9 @@ /** - * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + * WTFPL * Version 2, December 2004 * * Copyright (C) sponge * Planet Earth - * Everyone is permitted to copy and distribute verbatim or modified - * copies of this license document, and changing it is allowed as long - * as the name is changed. - * - * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - * TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - * - * 0. You just DO WHAT THE FUCK YOU WANT TO. * * See... * @@ -19,7 +11,7 @@ * and * http://en.wikipedia.org/wiki/WTFPL * - * ...for any additional details and liscense questions. + * ...for any additional details and license questions. */ package net.i2p.BOB.Demos.echo.echoclient; @@ -55,7 +47,7 @@ public class Main { // exit on anything not legal break; } - c = (char)(b & 0x7f); // We only really give a fuck about ASCII + c = (char)(b & 0x7f); // We only care about ASCII S = new String(S + c); } return S; diff --git a/apps/BOB/Demos/echo/echoserver/src/net/i2p/BOB/Demos/echo/echoserver/Main.java b/apps/BOB/Demos/echo/echoserver/src/net/i2p/BOB/Demos/echo/echoserver/Main.java index 86344b1a82..6b7be25182 100644 --- a/apps/BOB/Demos/echo/echoserver/src/net/i2p/BOB/Demos/echo/echoserver/Main.java +++ b/apps/BOB/Demos/echo/echoserver/src/net/i2p/BOB/Demos/echo/echoserver/Main.java @@ -1,17 +1,9 @@ /** - * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + * WTFPL * Version 2, December 2004 * * Copyright (C) sponge * Planet Earth - * Everyone is permitted to copy and distribute verbatim or modified - * copies of this license document, and changing it is allowed as long - * as the name is changed. - * - * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - * TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - * - * 0. You just DO WHAT THE FUCK YOU WANT TO. * * See... * @@ -19,7 +11,7 @@ * and * http://en.wikipedia.org/wiki/WTFPL * - * ...for any additional details and liscense questions. + * ...for any additional details and license questions. */ package net.i2p.BOB.Demos.echo.echoserver; @@ -52,7 +44,7 @@ public class Main { if(b < 20) { break; } - c = (char)(b & 0x7f); // We only really give a fuck about ASCII + c = (char)(b & 0x7f); // We only care about ASCII S = new String(S + c); } return S; diff --git a/apps/BOB/src/net/i2p/BOB/BOB.java b/apps/BOB/src/net/i2p/BOB/BOB.java index 0b55eb532d..517146dac1 100644 --- a/apps/BOB/src/net/i2p/BOB/BOB.java +++ b/apps/BOB/src/net/i2p/BOB/BOB.java @@ -1,17 +1,9 @@ /** - * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + * WTFPL * Version 2, December 2004 * * Copyright (C) sponge * Planet Earth - * Everyone is permitted to copy and distribute verbatim or modified - * copies of this license document, and changing it is allowed as long - * as the name is changed. - * - * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - * TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - * - * 0. You just DO WHAT THE FUCK YOU WANT TO. * * See... * @@ -19,7 +11,7 @@ * and * http://en.wikipedia.org/wiki/WTFPL * - * ...for any additional details and liscense questions. + * ...for any additional details and license questions. */ package net.i2p.BOB; diff --git a/apps/BOB/src/net/i2p/BOB/DoCMDS.java b/apps/BOB/src/net/i2p/BOB/DoCMDS.java index 38bb60ca6e..85be6e9ea2 100644 --- a/apps/BOB/src/net/i2p/BOB/DoCMDS.java +++ b/apps/BOB/src/net/i2p/BOB/DoCMDS.java @@ -1,17 +1,9 @@ /** - * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + * WTFPL * Version 2, December 2004 * * Copyright (C) sponge * Planet Earth - * Everyone is permitted to copy and distribute verbatim or modified - * copies of this license document, and changing it is allowed as long - * as the name is changed. - * - * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - * TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - * - * 0. You just DO WHAT THE FUCK YOU WANT TO. * * See... * @@ -19,7 +11,7 @@ * and * http://en.wikipedia.org/wiki/WTFPL * - * ...for any additional details and liscense questions. + * ...for any additional details and license questions. */ package net.i2p.BOB; diff --git a/apps/BOB/src/net/i2p/BOB/I2Plistener.java b/apps/BOB/src/net/i2p/BOB/I2Plistener.java index a94a40b7e1..05b12fcd34 100644 --- a/apps/BOB/src/net/i2p/BOB/I2Plistener.java +++ b/apps/BOB/src/net/i2p/BOB/I2Plistener.java @@ -1,17 +1,9 @@ /** - * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + * WTFPL * Version 2, December 2004 * * Copyright (C) sponge * Planet Earth - * Everyone is permitted to copy and distribute verbatim or modified - * copies of this license document, and changing it is allowed as long - * as the name is changed. - * - * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - * TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - * - * 0. You just DO WHAT THE FUCK YOU WANT TO. * * See... * @@ -19,7 +11,7 @@ * and * http://en.wikipedia.org/wiki/WTFPL * - * ...for any additional details and liscense questions. + * ...for any additional details and license questions. */ package net.i2p.BOB; diff --git a/apps/BOB/src/net/i2p/BOB/I2PtoTCP.java b/apps/BOB/src/net/i2p/BOB/I2PtoTCP.java index 4c186700f6..bf699db60e 100644 --- a/apps/BOB/src/net/i2p/BOB/I2PtoTCP.java +++ b/apps/BOB/src/net/i2p/BOB/I2PtoTCP.java @@ -1,17 +1,9 @@ /** - * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + * WTFPL * Version 2, December 2004 * * Copyright (C) sponge * Planet Earth - * Everyone is permitted to copy and distribute verbatim or modified - * copies of this license document, and changing it is allowed as long - * as the name is changed. - * - * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - * TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - * - * 0. You just DO WHAT THE FUCK YOU WANT TO. * * See... * @@ -19,7 +11,7 @@ * and * http://en.wikipedia.org/wiki/WTFPL * - * ...for any additional details and liscense questions. + * ...for any additional details and license questions. */ package net.i2p.BOB; diff --git a/apps/BOB/src/net/i2p/BOB/Lifted.java b/apps/BOB/src/net/i2p/BOB/Lifted.java index fbd23cba5f..4726824367 100644 --- a/apps/BOB/src/net/i2p/BOB/Lifted.java +++ b/apps/BOB/src/net/i2p/BOB/Lifted.java @@ -1,17 +1,9 @@ /** - * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + * WTFPL * Version 2, December 2004 * * Copyright (C) sponge * Planet Earth - * Everyone is permitted to copy and distribute verbatim or modified - * copies of this license document, and changing it is allowed as long - * as the name is changed. - * - * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - * TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - * - * 0. You just DO WHAT THE FUCK YOU WANT TO. * * See... * @@ -19,7 +11,7 @@ * and * http://en.wikipedia.org/wiki/WTFPL * - * ...for any additional details and liscense questions. + * ...for any additional details and license questions. */ package net.i2p.BOB; diff --git a/apps/BOB/src/net/i2p/BOB/MUXlisten.java b/apps/BOB/src/net/i2p/BOB/MUXlisten.java index 7d1e6478fb..faaf2899a9 100644 --- a/apps/BOB/src/net/i2p/BOB/MUXlisten.java +++ b/apps/BOB/src/net/i2p/BOB/MUXlisten.java @@ -1,17 +1,9 @@ /** - * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + * WTFPL * Version 2, December 2004 * * Copyright (C) sponge * Planet Earth - * Everyone is permitted to copy and distribute verbatim or modified - * copies of this license document, and changing it is allowed as long - * as the name is changed. - * - * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - * TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - * - * 0. You just DO WHAT THE FUCK YOU WANT TO. * * See... * @@ -19,7 +11,7 @@ * and * http://en.wikipedia.org/wiki/WTFPL * - * ...for any additional details and liscense questions. + * ...for any additional details and license questions. */ package net.i2p.BOB; @@ -302,14 +294,14 @@ public class MUXlisten implements Runnable { // Hopefully nuke stuff here... { - String boner = tg.getName(); + String groupName = tg.getName(); try { - _log.warn("destroySocketManager " + boner); + _log.warn("destroySocketManager " + groupName); socketManager.destroySocketManager(); - _log.warn("destroySocketManager Successful" + boner); + _log.warn("destroySocketManager Successful" + groupName); } catch (Exception e) { // nop - _log.warn("destroySocketManager Failed" + boner); + _log.warn("destroySocketManager Failed" + groupName); _log.warn(e.toString()); } } @@ -333,25 +325,25 @@ public class MUXlisten implements Runnable { // Wait around till all threads are collected. if (tg != null) { - String boner = tg.getName(); - // System.out.println("BOB: MUXlisten: Starting thread collection for: " + boner); - _log.warn("BOB: MUXlisten: Starting thread collection for: " + boner); + String groupName = tg.getName(); + // System.out.println("BOB: MUXlisten: Starting thread collection for: " + groupName); + _log.warn("BOB: MUXlisten: Starting thread collection for: " + groupName); if (tg.activeCount() + tg.activeGroupCount() != 0) { - // visit(tg, 0, boner); + // visit(tg, 0, groupName); int foo = tg.activeCount() + tg.activeGroupCount(); // hopefully no longer needed! // int bar = lives; - // System.out.println("BOB: MUXlisten: Waiting on threads for " + boner); - // System.out.println("\nBOB: MUXlisten: ThreadGroup dump BEGIN " + boner); - // visit(tg, 0, boner); - // System.out.println("BOB: MUXlisten: ThreadGroup dump END " + boner + "\n"); + // System.out.println("BOB: MUXlisten: Waiting on threads for " + groupName); + // System.out.println("\nBOB: MUXlisten: ThreadGroup dump BEGIN " + groupName); + // visit(tg, 0, groupName); + // System.out.println("BOB: MUXlisten: ThreadGroup dump END " + groupName + "\n"); // Happily spin forever :-( while (foo != 0) { foo = tg.activeCount() + tg.activeGroupCount(); // if (lives != bar && lives != 0) { - // System.out.println("\nBOB: MUXlisten: ThreadGroup dump BEGIN " + boner); - // visit(tg, 0, boner); - // System.out.println("BOB: MUXlisten: ThreadGroup dump END " + boner + "\n"); + // System.out.println("\nBOB: MUXlisten: ThreadGroup dump BEGIN " + groupName); + // visit(tg, 0, groupName); + // System.out.println("BOB: MUXlisten: ThreadGroup dump END " + groupName + "\n"); // } // bar = lives; try { @@ -361,8 +353,8 @@ public class MUXlisten implements Runnable { } } } - // System.out.println("BOB: MUXlisten: Threads went away. Success: " + boner); - _log.warn("BOB: MUXlisten: Threads went away. Success: " + boner); + // System.out.println("BOB: MUXlisten: Threads went away. Success: " + groupName); + _log.warn("BOB: MUXlisten: Threads went away. Success: " + groupName); tg.destroy(); // Zap reference to the ThreadGroup so the JVM can GC it. tg = null; diff --git a/apps/BOB/src/net/i2p/BOB/Main.java b/apps/BOB/src/net/i2p/BOB/Main.java index 099d016362..89fd954893 100644 --- a/apps/BOB/src/net/i2p/BOB/Main.java +++ b/apps/BOB/src/net/i2p/BOB/Main.java @@ -1,17 +1,9 @@ /** - * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + * WTFPL * Version 2, December 2004 * * Copyright (C) sponge * Planet Earth - * Everyone is permitted to copy and distribute verbatim or modified - * copies of this license document, and changing it is allowed as long - * as the name is changed. - * - * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - * TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - * - * 0. You just DO WHAT THE FUCK YOU WANT TO. * * See... * @@ -19,7 +11,7 @@ * and * http://en.wikipedia.org/wiki/WTFPL * - * ...for any additional details and liscense questions. + * ...for any additional details and license questions. */ package net.i2p.BOB; diff --git a/apps/BOB/src/net/i2p/BOB/NamedDB.java b/apps/BOB/src/net/i2p/BOB/NamedDB.java index b5189647bc..46796136dd 100644 --- a/apps/BOB/src/net/i2p/BOB/NamedDB.java +++ b/apps/BOB/src/net/i2p/BOB/NamedDB.java @@ -1,17 +1,9 @@ /** - * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + * WTFPL * Version 2, December 2004 * * Copyright (C) sponge * Planet Earth - * Everyone is permitted to copy and distribute verbatim or modified - * copies of this license document, and changing it is allowed as long - * as the name is changed. - * - * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - * TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - * - * 0. You just DO WHAT THE FUCK YOU WANT TO. * * See... * @@ -19,7 +11,7 @@ * and * http://en.wikipedia.org/wiki/WTFPL * - * ...for any additional details and liscense questions. + * ...for any additional details and license questions. */ package net.i2p.BOB; diff --git a/apps/BOB/src/net/i2p/BOB/TCPio.java b/apps/BOB/src/net/i2p/BOB/TCPio.java index ca3e5c833c..e684d53278 100644 --- a/apps/BOB/src/net/i2p/BOB/TCPio.java +++ b/apps/BOB/src/net/i2p/BOB/TCPio.java @@ -1,17 +1,9 @@ /** - * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + * WTFPL * Version 2, December 2004 * * Copyright (C) sponge * Planet Earth - * Everyone is permitted to copy and distribute verbatim or modified - * copies of this license document, and changing it is allowed as long - * as the name is changed. - * - * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - * TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - * - * 0. You just DO WHAT THE FUCK YOU WANT TO. * * See... * @@ -19,7 +11,7 @@ * and * http://en.wikipedia.org/wiki/WTFPL * - * ...for any additional details and liscense questions. + * ...for any additional details and license questions. */ package net.i2p.BOB; diff --git a/apps/BOB/src/net/i2p/BOB/TCPlistener.java b/apps/BOB/src/net/i2p/BOB/TCPlistener.java index 35227481a2..90fff59179 100644 --- a/apps/BOB/src/net/i2p/BOB/TCPlistener.java +++ b/apps/BOB/src/net/i2p/BOB/TCPlistener.java @@ -1,17 +1,9 @@ /** - * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + * WTFPL * Version 2, December 2004 * * Copyright (C) sponge * Planet Earth - * Everyone is permitted to copy and distribute verbatim or modified - * copies of this license document, and changing it is allowed as long - * as the name is changed. - * - * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - * TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - * - * 0. You just DO WHAT THE FUCK YOU WANT TO. * * See... * @@ -19,7 +11,7 @@ * and * http://en.wikipedia.org/wiki/WTFPL * - * ...for any additional details and liscense questions. + * ...for any additional details and license questions. */ package net.i2p.BOB; diff --git a/apps/BOB/src/net/i2p/BOB/TCPtoI2P.java b/apps/BOB/src/net/i2p/BOB/TCPtoI2P.java index 05d3f5b651..d83c061a00 100644 --- a/apps/BOB/src/net/i2p/BOB/TCPtoI2P.java +++ b/apps/BOB/src/net/i2p/BOB/TCPtoI2P.java @@ -1,17 +1,9 @@ /** - * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + * WTFPL * Version 2, December 2004 * * Copyright (C) sponge * Planet Earth - * Everyone is permitted to copy and distribute verbatim or modified - * copies of this license document, and changing it is allowed as long - * as the name is changed. - * - * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - * TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - * - * 0. You just DO WHAT THE FUCK YOU WANT TO. * * See... * @@ -19,7 +11,7 @@ * and * http://en.wikipedia.org/wiki/WTFPL * - * ...for any additional details and liscense questions. + * ...for any additional details and license questions. */ package net.i2p.BOB; @@ -94,7 +86,7 @@ public class TCPtoI2P implements Runnable { // exit on anything not legal break; } - c = (char) (b & 0x7f); // We only really give a fuck about ASCII + c = (char) (b & 0x7f); // We only care about ASCII S = new String(S + c); } return S; diff --git a/apps/BOB/src/net/i2p/BOB/UDPIOthread.java b/apps/BOB/src/net/i2p/BOB/UDPIOthread.java index b421a6a945..e5c753f5e1 100644 --- a/apps/BOB/src/net/i2p/BOB/UDPIOthread.java +++ b/apps/BOB/src/net/i2p/BOB/UDPIOthread.java @@ -1,17 +1,9 @@ /** - * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + * WTFPL * Version 2, December 2004 * * Copyright (C) sponge * Planet Earth - * Everyone is permitted to copy and distribute verbatim or modified - * copies of this license document, and changing it is allowed as long - * as the name is changed. - * - * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - * TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - * - * 0. You just DO WHAT THE FUCK YOU WANT TO. * * See... * @@ -19,7 +11,7 @@ * and * http://en.wikipedia.org/wiki/WTFPL * - * ...for any additional details and liscense questions. + * ...for any additional details and license questions. */ package net.i2p.BOB; diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPBidirProxy.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPBidirProxy.java index 8c188d1157..56c2e7550c 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPBidirProxy.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPBidirProxy.java @@ -1,17 +1,9 @@ /** - * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + * WTFPL * Version 2, December 2004 * * Copyright (C) sponge * Planet Earth - * Everyone is permitted to copy and distribute verbatim or modified - * copies of this license document, and changing it is allowed as long - * as the name is changed. - * - * DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - * TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - * - * 0. You just DO WHAT THE FUCK YOU WANT TO. * * See... * @@ -19,9 +11,8 @@ * and * http://en.wikipedia.org/wiki/WTFPL * - * ...for any additional details and liscense questions. + * ...for any additional details and license questions. */ - package net.i2p.i2ptunnel; // import java.util.ArrayList; diff --git a/history.txt b/history.txt index 9c8c5a6fc2..2e6a34f9ea 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,6 @@ +2012-10-30 sponge + * cleanups as requested + 2012-10-28 zzz * Addresses: - Add methods for connectivity detection