[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r7148 - in GNUnet: libltdl po src/applications/datastore sr
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r7148 - in GNUnet: libltdl po src/applications/datastore src/applications/fs/collection src/applications/fs/ecrs src/applications/fs/fsui src/applications/fs/gap src/applications/fs/lib src/applications/fs/tools src/applications/fs/uritrack src/applications/sqstore_mysql src/applications/testing src/include src/server src/setup/lib src/setup/ncurses src/transports src/util/crypto src/util/disk src/util/os src/util/pseudonym |
|
Date: |
Thu, 12 Jun 2008 00:01:45 -0600 (MDT) |
Author: grothoff
Date: 2008-06-12 00:01:44 -0600 (Thu, 12 Jun 2008)
New Revision: 7148
Modified:
GNUnet/libltdl/ltdl.c
GNUnet/po/GNUnet.pot
GNUnet/po/de.po
GNUnet/po/es.po
GNUnet/po/sv.po
GNUnet/po/vi.po
GNUnet/src/applications/datastore/datastore.c
GNUnet/src/applications/fs/collection/collection.c
GNUnet/src/applications/fs/ecrs/download.c
GNUnet/src/applications/fs/ecrs/namespace.c
GNUnet/src/applications/fs/ecrs/search.c
GNUnet/src/applications/fs/ecrs/upload.c
GNUnet/src/applications/fs/fsui/download.c
GNUnet/src/applications/fs/fsui/fsui.c
GNUnet/src/applications/fs/fsui/search.c
GNUnet/src/applications/fs/fsui/upload.c
GNUnet/src/applications/fs/gap/fs.c
GNUnet/src/applications/fs/gap/querymanager.c
GNUnet/src/applications/fs/gap/querymanager.h
GNUnet/src/applications/fs/lib/fslib.c
GNUnet/src/applications/fs/tools/gnunet-auto-share.c
GNUnet/src/applications/fs/tools/gnunet-unindex.c
GNUnet/src/applications/fs/uritrack/file_info.c
GNUnet/src/applications/fs/uritrack/uri_info.c
GNUnet/src/applications/sqstore_mysql/mysql.c
GNUnet/src/applications/testing/remote.c
GNUnet/src/applications/testing/remotetopologies.c
GNUnet/src/applications/testing/testing.c
GNUnet/src/include/gnunet_ecrs_lib.h
GNUnet/src/include/gnunet_fs_lib.h
GNUnet/src/include/gnunet_util_disk.h
GNUnet/src/server/connection.c
GNUnet/src/server/version.c
GNUnet/src/setup/lib/gns.c
GNUnet/src/setup/ncurses/mconf.c
GNUnet/src/transports/http.c
GNUnet/src/util/crypto/hashing.c
GNUnet/src/util/disk/filenames.c
GNUnet/src/util/os/semaphore.c
GNUnet/src/util/pseudonym/common.c
Log:
indent
Modified: GNUnet/libltdl/ltdl.c
===================================================================
--- GNUnet/libltdl/ltdl.c 2008-06-12 05:49:44 UTC (rev 7147)
+++ GNUnet/libltdl/ltdl.c 2008-06-12 06:01:44 UTC (rev 7148)
@@ -1770,9 +1770,9 @@
*) (((struct
dylib_command
*)
- lc)->
- dylib.name.
- offset +
+ lc)->dylib.
+ name.offset
+ +
(unsigned
long)
lc));
Modified: GNUnet/po/GNUnet.pot
===================================================================
--- GNUnet/po/GNUnet.pot 2008-06-12 05:49:44 UTC (rev 7147)
+++ GNUnet/po/GNUnet.pot 2008-06-12 06:01:44 UTC (rev 7148)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2008-06-07 23:46-0600\n"
+"POT-Creation-Date: 2008-06-11 23:26-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -1939,7 +1939,7 @@
msgstr ""
#: src/applications/dht/tools/dht-query.c:141
-#: src/applications/fs/tools/gnunet-auto-share.c:370
+#: src/applications/fs/tools/gnunet-auto-share.c:624
#, c-format
msgid "Failed to connect to gnunetd.\n"
msgstr ""
@@ -2214,7 +2214,7 @@
msgstr ""
#: src/applications/fs/tools/gnunet-pseudonym.c:70
-#: src/applications/fs/tools/gnunet-auto-share.c:140
+#: src/applications/fs/tools/gnunet-auto-share.c:152
#: src/applications/fs/tools/gnunet-insert.c:249
#: src/applications/fs/tools/gnunet-search.c:125
#: src/applications/fs/tools/gnunet-download.c:77
@@ -2381,12 +2381,12 @@
msgid "Listed %d matching entries.\n"
msgstr ""
-#: src/applications/fs/tools/gnunet-auto-share.c:101
+#: src/applications/fs/tools/gnunet-auto-share.c:113
#, c-format
msgid "Upload of `%s' complete, URI is `%s'.\n"
msgstr ""
-#: src/applications/fs/tools/gnunet-auto-share.c:110
+#: src/applications/fs/tools/gnunet-auto-share.c:122
#: src/applications/fs/tools/gnunet-insert.c:223
#, c-format
msgid ""
@@ -2394,7 +2394,7 @@
"Upload aborted.\n"
msgstr ""
-#: src/applications/fs/tools/gnunet-auto-share.c:116
+#: src/applications/fs/tools/gnunet-auto-share.c:128
#: src/applications/fs/tools/gnunet-insert.c:228
#, c-format
msgid ""
@@ -2402,7 +2402,7 @@
"Error uploading file: %s"
msgstr ""
-#: src/applications/fs/tools/gnunet-auto-share.c:127
+#: src/applications/fs/tools/gnunet-auto-share.c:139
#: src/applications/fs/tools/gnunet-insert.c:237
#, c-format
msgid ""
@@ -2410,43 +2410,43 @@
"Unexpected event: %d\n"
msgstr ""
-#: src/applications/fs/tools/gnunet-auto-share.c:144
+#: src/applications/fs/tools/gnunet-auto-share.c:156
msgid ""
"run in debug mode; gnunet-auto-share will not daemonize and error messages "
"will be written to stderr instead of a logfile"
msgstr ""
-#: src/applications/fs/tools/gnunet-auto-share.c:150
+#: src/applications/fs/tools/gnunet-auto-share.c:162
#: src/applications/fs/tools/gnunet-insert.c:262
msgid ""
"do not use libextractor to add additional references to directory entries "
"and/or the published file"
msgstr ""
-#: src/applications/fs/tools/gnunet-auto-share.c:152
+#: src/applications/fs/tools/gnunet-auto-share.c:164
msgid "Automatically share a directory."
msgstr ""
-#: src/applications/fs/tools/gnunet-auto-share.c:155
+#: src/applications/fs/tools/gnunet-auto-share.c:167
#: src/applications/fs/tools/gnunet-insert.c:276
msgid ""
"add an additional keyword for all files and directories (this option can be "
"specified multiple times)"
msgstr ""
-#: src/applications/fs/tools/gnunet-auto-share.c:160
+#: src/applications/fs/tools/gnunet-auto-share.c:172
#: src/applications/fs/tools/gnunet-insert.c:293
msgid "specify the priority of the content"
msgstr ""
-#: src/applications/fs/tools/gnunet-auto-share.c:267
+#: src/applications/fs/tools/gnunet-auto-share.c:517
#, c-format
msgid "Unknown keyword type `%s' in metadata configuration\n"
msgstr ""
-#: src/applications/fs/tools/gnunet-auto-share.c:559
+#: src/applications/fs/tools/gnunet-auto-share.c:841
#, c-format
-msgid "You must specify one and only one directory for sharing.\n"
+msgid "You must specify at least one directory for sharing.\n"
msgstr ""
#: src/applications/fs/tools/gnunet-insert.c:113
@@ -2714,11 +2714,11 @@
msgid "File stored as `%s'.\n"
msgstr ""
-#: src/applications/fs/uritrack/file_info.c:134
+#: src/applications/fs/uritrack/file_info.c:102
msgid "Collecting file identifiers disabled.\n"
msgstr ""
-#: src/applications/fs/uritrack/file_info.c:413
+#: src/applications/fs/uritrack/file_info.c:381
#, c-format
msgid "Deleted corrupt URI database in `%s'."
msgstr ""
@@ -2742,22 +2742,22 @@
msgid "Cannot hash `%s'.\n"
msgstr ""
-#: src/applications/fs/ecrs/upload.c:206
+#: src/applications/fs/ecrs/upload.c:216
#, c-format
msgid "Initialization for indexing file `%s' failed.\n"
msgstr ""
-#: src/applications/fs/ecrs/upload.c:214
+#: src/applications/fs/ecrs/upload.c:224
#, c-format
-msgid "Indexing file `%s' failed. Trying to insert file...\n"
+msgid "Indexing file `%s' failed. Suggestion: try to insert the file.\n"
msgstr ""
-#: src/applications/fs/ecrs/upload.c:228
+#: src/applications/fs/ecrs/upload.c:238
#, c-format
msgid "Cannot open file `%s': `%s'"
msgstr ""
-#: src/applications/fs/ecrs/upload.c:313
+#: src/applications/fs/ecrs/upload.c:323
#, c-format
msgid "Indexing data of file `%s' failed at position %llu.\n"
msgstr ""
@@ -2787,11 +2787,11 @@
"`unknown' instead.\n"
msgstr ""
-#: src/applications/fs/ecrs/search.c:150
+#: src/applications/fs/ecrs/search.c:153
msgid "CHK URI not allowed for search.\n"
msgstr ""
-#: src/applications/fs/ecrs/search.c:205
+#: src/applications/fs/ecrs/search.c:208
msgid "LOC URI not allowed for search.\n"
msgstr ""
@@ -2820,23 +2820,27 @@
msgid "Format of file `%s' is invalid, trying to remove.\n"
msgstr ""
-#: src/applications/fs/ecrs/download.c:600
+#: src/applications/fs/ecrs/download.c:610
msgid ""
"Decrypted content does not match key. This is either a bug or a maliciously "
"inserted file. Download aborted.\n"
msgstr ""
-#: src/applications/fs/ecrs/download.c:610
+#: src/applications/fs/ecrs/download.c:620
msgid "IO error."
msgstr ""
-#: src/applications/fs/collection/collection.c:567
-#: src/applications/fs/collection/collection.c:570
+#: src/applications/fs/collection/collection.c:557
+#: src/applications/fs/collection/collection.c:560
#, c-format
msgid "Revision %u"
msgstr ""
-#: src/applications/fs/fsui/upload.c:331
+#: src/applications/fs/fsui/upload.c:321
+msgid "Application aborted."
+msgstr ""
+
+#: src/applications/fs/fsui/upload.c:335
msgid "Failed to create temporary directory."
msgstr ""
@@ -2869,30 +2873,30 @@
msgid "Datastore full.\n"
msgstr ""
-#: src/applications/fs/gap/fs.c:784
+#: src/applications/fs/gap/fs.c:815
msgid "# gap requests total received"
msgstr ""
-#: src/applications/fs/gap/fs.c:786
+#: src/applications/fs/gap/fs.c:817
msgid "# gap requests dropped due to load"
msgstr ""
-#: src/applications/fs/gap/fs.c:788
+#: src/applications/fs/gap/fs.c:819
msgid "# gap content total received"
msgstr ""
-#: src/applications/fs/gap/fs.c:790
+#: src/applications/fs/gap/fs.c:821
msgid "# gap total trust awarded"
msgstr ""
-#: src/applications/fs/gap/fs.c:818
+#: src/applications/fs/gap/fs.c:849
#, c-format
msgid ""
-"`%s' registering client handlers %d %d %d %d %d %d %d and P2P handlers %d %"
-"d\n"
+"`%s' registering client handlers %d %d %d %d %d %d %d %d and P2P handlers %d "
+"%d\n"
msgstr ""
-#: src/applications/fs/gap/fs.c:868
+#: src/applications/fs/gap/fs.c:905
msgid "enables (anonymous) file-sharing"
msgstr ""
@@ -2922,23 +2926,23 @@
msgid "# total RC of interned peer IDs in pid table"
msgstr ""
-#: src/applications/fs/gap/querymanager.c:638
+#: src/applications/fs/gap/querymanager.c:708
msgid "# gap client queries received"
msgstr ""
-#: src/applications/fs/gap/querymanager.c:640
+#: src/applications/fs/gap/querymanager.c:710
msgid "# gap replies sent to clients"
msgstr ""
-#: src/applications/fs/gap/querymanager.c:642
+#: src/applications/fs/gap/querymanager.c:712
msgid "# gap client requests tracked"
msgstr ""
-#: src/applications/fs/gap/querymanager.c:644
+#: src/applications/fs/gap/querymanager.c:714
msgid "# gap client requests injected"
msgstr ""
-#: src/applications/fs/gap/querymanager.c:647
+#: src/applications/fs/gap/querymanager.c:717
msgid "# gap query bloomfilter resizing updates"
msgstr ""
@@ -3538,7 +3542,7 @@
msgid "run in client mode (for getting client configuration values)"
msgstr ""
-#: src/server/version.c:143
+#: src/server/version.c:129
msgid ""
"Failed to determine filename used to store GNUnet version information!\n"
msgstr ""
Modified: GNUnet/po/de.po
===================================================================
--- GNUnet/po/de.po 2008-06-12 05:49:44 UTC (rev 7147)
+++ GNUnet/po/de.po 2008-06-12 06:01:44 UTC (rev 7148)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: GNUnet 0.7.0b\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2008-06-07 23:46-0600\n"
+"POT-Creation-Date: 2008-06-11 23:26-0600\n"
"PO-Revision-Date: 2006-03-17 21:37+0100\n"
"Last-Translator: Nils Durner <address@hidden>\n"
"Language-Team: German <address@hidden>\n"
@@ -2126,7 +2126,7 @@
msgstr "'%s(%s,%s)' fehlgeschlagen.\n"
#: src/applications/dht/tools/dht-query.c:141
-#: src/applications/fs/tools/gnunet-auto-share.c:370
+#: src/applications/fs/tools/gnunet-auto-share.c:624
#, c-format
msgid "Failed to connect to gnunetd.\n"
msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
@@ -2427,7 +2427,7 @@
msgstr "# Sitzungen aufgebaut"
#: src/applications/fs/tools/gnunet-pseudonym.c:70
-#: src/applications/fs/tools/gnunet-auto-share.c:140
+#: src/applications/fs/tools/gnunet-auto-share.c:152
#: src/applications/fs/tools/gnunet-insert.c:249
#: src/applications/fs/tools/gnunet-search.c:125
#: src/applications/fs/tools/gnunet-download.c:77
@@ -2613,14 +2613,14 @@
msgid "Listed %d matching entries.\n"
msgstr "%d übereinstimmende Einträge aufgelistet.\n"
-#: src/applications/fs/tools/gnunet-auto-share.c:101
+#: src/applications/fs/tools/gnunet-auto-share.c:113
#, fuzzy, c-format
msgid "Upload of `%s' complete, URI is `%s'.\n"
msgstr ""
"Upload von `%s' komplett, derzeitige durchschnittliche Geschwindigkeit "
"beträgt %8.3f KB/s.\n"
-#: src/applications/fs/tools/gnunet-auto-share.c:110
+#: src/applications/fs/tools/gnunet-auto-share.c:122
#: src/applications/fs/tools/gnunet-insert.c:223
#, c-format
msgid ""
@@ -2630,7 +2630,7 @@
"\n"
"Upload abgebrochen.\n"
-#: src/applications/fs/tools/gnunet-auto-share.c:116
+#: src/applications/fs/tools/gnunet-auto-share.c:128
#: src/applications/fs/tools/gnunet-insert.c:228
#, fuzzy, c-format
msgid ""
@@ -2640,7 +2640,7 @@
"\n"
"Fehler beim Uploaden der Datei: %s\n"
-#: src/applications/fs/tools/gnunet-auto-share.c:127
+#: src/applications/fs/tools/gnunet-auto-share.c:139
#: src/applications/fs/tools/gnunet-insert.c:237
#, c-format
msgid ""
@@ -2648,7 +2648,7 @@
"Unexpected event: %d\n"
msgstr ""
-#: src/applications/fs/tools/gnunet-auto-share.c:144
+#: src/applications/fs/tools/gnunet-auto-share.c:156
#, fuzzy
msgid ""
"run in debug mode; gnunet-auto-share will not daemonize and error messages "
@@ -2658,7 +2658,7 @@
"Fehlermeldungen werden nicht in die Protokolldatei, sondern auf die "
"Standardfehlerausgabe (stderr) geschrieben."
-#: src/applications/fs/tools/gnunet-auto-share.c:150
+#: src/applications/fs/tools/gnunet-auto-share.c:162
#: src/applications/fs/tools/gnunet-insert.c:262
#, fuzzy
msgid ""
@@ -2668,11 +2668,11 @@
"benutze libextractor um weitere direkte Referenzen zu Dateien in "
"Verzeichnissen zu erzeugen"
-#: src/applications/fs/tools/gnunet-auto-share.c:152
+#: src/applications/fs/tools/gnunet-auto-share.c:164
msgid "Automatically share a directory."
msgstr ""
-#: src/applications/fs/tools/gnunet-auto-share.c:155
+#: src/applications/fs/tools/gnunet-auto-share.c:167
#: src/applications/fs/tools/gnunet-insert.c:276
msgid ""
"add an additional keyword for all files and directories (this option can be "
@@ -2681,19 +2681,19 @@
"Ein zusätzliches Schlüsselwort für alle Dateien und Verzeichnisse hinzufügen "
"(diese Option kann mehrmals angegeben werden)"
-#: src/applications/fs/tools/gnunet-auto-share.c:160
+#: src/applications/fs/tools/gnunet-auto-share.c:172
#: src/applications/fs/tools/gnunet-insert.c:293
msgid "specify the priority of the content"
msgstr "Die Priorität des Inhalts angeben"
-#: src/applications/fs/tools/gnunet-auto-share.c:267
+#: src/applications/fs/tools/gnunet-auto-share.c:517
#, c-format
msgid "Unknown keyword type `%s' in metadata configuration\n"
msgstr ""
-#: src/applications/fs/tools/gnunet-auto-share.c:559
+#: src/applications/fs/tools/gnunet-auto-share.c:841
#, fuzzy, c-format
-msgid "You must specify one and only one directory for sharing.\n"
+msgid "You must specify at least one directory for sharing.\n"
msgstr "Sie dürfen nur eine Datei zum Deindizieren angeben.\n"
#: src/applications/fs/tools/gnunet-insert.c:113
@@ -2991,11 +2991,11 @@
msgid "File stored as `%s'.\n"
msgstr "Datei wurde als `%s' gespeichert.\n"
-#: src/applications/fs/uritrack/file_info.c:134
+#: src/applications/fs/uritrack/file_info.c:102
msgid "Collecting file identifiers disabled.\n"
msgstr "Einsammeln von Dateibezeichnern deaktiviert.\n"
-#: src/applications/fs/uritrack/file_info.c:413
+#: src/applications/fs/uritrack/file_info.c:381
#, c-format
msgid "Deleted corrupt URI database in `%s'."
msgstr ""
@@ -3019,22 +3019,22 @@
msgid "Cannot hash `%s'.\n"
msgstr "`%s' konnte nicht gehashed werden.\n"
-#: src/applications/fs/ecrs/upload.c:206
+#: src/applications/fs/ecrs/upload.c:216
#, c-format
msgid "Initialization for indexing file `%s' failed.\n"
msgstr "Initialisierung der Indizierung der Datei `%s' fehlgeschlagen.\n"
-#: src/applications/fs/ecrs/upload.c:214
-#, c-format
-msgid "Indexing file `%s' failed. Trying to insert file...\n"
+#: src/applications/fs/ecrs/upload.c:224
+#, fuzzy, c-format
+msgid "Indexing file `%s' failed. Suggestion: try to insert the file.\n"
msgstr "Indizieren der Datei `%s' schlug fehl. Versuch Datei einzufügen...\n"
-#: src/applications/fs/ecrs/upload.c:228
+#: src/applications/fs/ecrs/upload.c:238
#, fuzzy, c-format
msgid "Cannot open file `%s': `%s'"
msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
-#: src/applications/fs/ecrs/upload.c:313
+#: src/applications/fs/ecrs/upload.c:323
#, fuzzy, c-format
msgid "Indexing data of file `%s' failed at position %llu.\n"
msgstr "Indizierung der Daten schlug an Position %i fehl.\n"
@@ -3065,11 +3065,11 @@
"`unknown' instead.\n"
msgstr ""
-#: src/applications/fs/ecrs/search.c:150
+#: src/applications/fs/ecrs/search.c:153
msgid "CHK URI not allowed for search.\n"
msgstr "CHK URI ist nicht erlaubt für Suchen.\n"
-#: src/applications/fs/ecrs/search.c:205
+#: src/applications/fs/ecrs/search.c:208
msgid "LOC URI not allowed for search.\n"
msgstr "LOC URI ist nicht erlaubt für Suchen.\n"
@@ -3098,7 +3098,7 @@
msgid "Format of file `%s' is invalid, trying to remove.\n"
msgstr "Format der Datei `%s' ist ungültig.\n"
-#: src/applications/fs/ecrs/download.c:600
+#: src/applications/fs/ecrs/download.c:610
msgid ""
"Decrypted content does not match key. This is either a bug or a maliciously "
"inserted file. Download aborted.\n"
@@ -3107,18 +3107,23 @@
"Bug oder eine mit bösen Absichten eingefügte Datei. Download wurde "
"abgebrochen.\n"
-#: src/applications/fs/ecrs/download.c:610
+#: src/applications/fs/ecrs/download.c:620
msgid "IO error."
msgstr ""
-#: src/applications/fs/collection/collection.c:567
-#: src/applications/fs/collection/collection.c:570
+#: src/applications/fs/collection/collection.c:557
+#: src/applications/fs/collection/collection.c:560
#, c-format
msgid "Revision %u"
msgstr ""
-#: src/applications/fs/fsui/upload.c:331
+#: src/applications/fs/fsui/upload.c:321
#, fuzzy
+msgid "Application aborted."
+msgstr "_Optionen"
+
+#: src/applications/fs/fsui/upload.c:335
+#, fuzzy
msgid "Failed to create temporary directory."
msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
@@ -3154,32 +3159,32 @@
msgid "Datastore full.\n"
msgstr ""
-#: src/applications/fs/gap/fs.c:784
+#: src/applications/fs/gap/fs.c:815
msgid "# gap requests total received"
msgstr "# gap Anfragen insgesamt empfangen"
-#: src/applications/fs/gap/fs.c:786
+#: src/applications/fs/gap/fs.c:817
#, fuzzy
msgid "# gap requests dropped due to load"
msgstr "# gap Anfragen verworfen: Kollision in RT"
-#: src/applications/fs/gap/fs.c:788
+#: src/applications/fs/gap/fs.c:819
#, fuzzy
msgid "# gap content total received"
msgstr "# gap Anfragen insgesamt empfangen"
-#: src/applications/fs/gap/fs.c:790
+#: src/applications/fs/gap/fs.c:821
msgid "# gap total trust awarded"
msgstr ""
-#: src/applications/fs/gap/fs.c:818
+#: src/applications/fs/gap/fs.c:849
#, fuzzy, c-format
msgid ""
-"`%s' registering client handlers %d %d %d %d %d %d %d and P2P handlers %d %"
-"d\n"
+"`%s' registering client handlers %d %d %d %d %d %d %d %d and P2P handlers %d "
+"%d\n"
msgstr "`%s' registriert die Client Handler %d %d %d %d %d %d %d %d %d\n"
-#: src/applications/fs/gap/fs.c:868
+#: src/applications/fs/gap/fs.c:905
msgid "enables (anonymous) file-sharing"
msgstr "Ermöglicht (anonymes) Filesharing"
@@ -3214,27 +3219,27 @@
msgid "# total RC of interned peer IDs in pid table"
msgstr ""
-#: src/applications/fs/gap/querymanager.c:638
+#: src/applications/fs/gap/querymanager.c:708
#, fuzzy
msgid "# gap client queries received"
msgstr "# gap Anfragen insgesamt empfangen"
-#: src/applications/fs/gap/querymanager.c:640
+#: src/applications/fs/gap/querymanager.c:710
#, fuzzy
msgid "# gap replies sent to clients"
msgstr "# gap Anfragen insgesamt empfangen"
-#: src/applications/fs/gap/querymanager.c:642
+#: src/applications/fs/gap/querymanager.c:712
#, fuzzy
msgid "# gap client requests tracked"
msgstr "# gap Anfragen insgesamt empfangen"
-#: src/applications/fs/gap/querymanager.c:644
+#: src/applications/fs/gap/querymanager.c:714
#, fuzzy
msgid "# gap client requests injected"
msgstr "# Client Trace-Anfragen empfangen"
-#: src/applications/fs/gap/querymanager.c:647
+#: src/applications/fs/gap/querymanager.c:717
msgid "# gap query bloomfilter resizing updates"
msgstr ""
@@ -3851,7 +3856,7 @@
"Im Benuter-Modus laufen (um benutzerspezifische Konfigurationseinstellungen "
"zu holen"
-#: src/server/version.c:143
+#: src/server/version.c:129
msgid ""
"Failed to determine filename used to store GNUnet version information!\n"
msgstr ""
Modified: GNUnet/po/es.po
===================================================================
--- GNUnet/po/es.po 2008-06-12 05:49:44 UTC (rev 7147)
+++ GNUnet/po/es.po 2008-06-12 06:01:44 UTC (rev 7148)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: GNUnet 0.7.0e\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2008-06-07 23:46-0600\n"
+"POT-Creation-Date: 2008-06-11 23:26-0600\n"
"PO-Revision-Date: 2006-06-29 12:05+0200\n"
"Last-Translator: Miguel Angel Arruga <address@hidden>\n"
"Language-Team: Spanish\n"
@@ -2100,7 +2100,7 @@
msgstr "'%s(%s, %s)' falló.\n"
#: src/applications/dht/tools/dht-query.c:141
-#: src/applications/fs/tools/gnunet-auto-share.c:370
+#: src/applications/fs/tools/gnunet-auto-share.c:624
#, c-format
msgid "Failed to connect to gnunetd.\n"
msgstr "Fallo al conectar a gnunetd.\n"
@@ -2393,7 +2393,7 @@
msgstr "# sesiones establecidas"
#: src/applications/fs/tools/gnunet-pseudonym.c:70
-#: src/applications/fs/tools/gnunet-auto-share.c:140
+#: src/applications/fs/tools/gnunet-auto-share.c:152
#: src/applications/fs/tools/gnunet-insert.c:249
#: src/applications/fs/tools/gnunet-search.c:125
#: src/applications/fs/tools/gnunet-download.c:77
@@ -2575,14 +2575,14 @@
msgid "Listed %d matching entries.\n"
msgstr "%d entradas encontradas.\n"
-#: src/applications/fs/tools/gnunet-auto-share.c:101
+#: src/applications/fs/tools/gnunet-auto-share.c:113
#, fuzzy, c-format
msgid "Upload of `%s' complete, URI is `%s'.\n"
msgstr ""
"Subida de '%s' completada, la velocidad media de subida actual es %8.3f "
"kbps.\n"
-#: src/applications/fs/tools/gnunet-auto-share.c:110
+#: src/applications/fs/tools/gnunet-auto-share.c:122
#: src/applications/fs/tools/gnunet-insert.c:223
#, fuzzy, c-format
msgid ""
@@ -2590,7 +2590,7 @@
"Upload aborted.\n"
msgstr "Descarga abortada"
-#: src/applications/fs/tools/gnunet-auto-share.c:116
+#: src/applications/fs/tools/gnunet-auto-share.c:128
#: src/applications/fs/tools/gnunet-insert.c:228
#, fuzzy, c-format
msgid ""
@@ -2600,7 +2600,7 @@
"\n"
"Error subiendo el fichero %s\n"
-#: src/applications/fs/tools/gnunet-auto-share.c:127
+#: src/applications/fs/tools/gnunet-auto-share.c:139
#: src/applications/fs/tools/gnunet-insert.c:237
#, c-format
msgid ""
@@ -2608,7 +2608,7 @@
"Unexpected event: %d\n"
msgstr ""
-#: src/applications/fs/tools/gnunet-auto-share.c:144
+#: src/applications/fs/tools/gnunet-auto-share.c:156
#, fuzzy
msgid ""
"run in debug mode; gnunet-auto-share will not daemonize and error messages "
@@ -2617,7 +2617,7 @@
"se ejecuta en modo de depuración; gnunetd no sera un demonio y los mensajes "
"de error serán escritos a través de stderr en vez de en un fichero de log"
-#: src/applications/fs/tools/gnunet-auto-share.c:150
+#: src/applications/fs/tools/gnunet-auto-share.c:162
#: src/applications/fs/tools/gnunet-insert.c:262
#, fuzzy
msgid ""
@@ -2627,11 +2627,11 @@
"usa libextractor para añadir referencias directas adicionales a las entradas "
"del directorio"
-#: src/applications/fs/tools/gnunet-auto-share.c:152
+#: src/applications/fs/tools/gnunet-auto-share.c:164
msgid "Automatically share a directory."
msgstr ""
-#: src/applications/fs/tools/gnunet-auto-share.c:155
+#: src/applications/fs/tools/gnunet-auto-share.c:167
#: src/applications/fs/tools/gnunet-insert.c:276
msgid ""
"add an additional keyword for all files and directories (this option can be "
@@ -2640,19 +2640,19 @@
"añade una clave adicional para todos los ficheros y directorios (esta opción "
"puede ser especificada varias veces)"
-#: src/applications/fs/tools/gnunet-auto-share.c:160
+#: src/applications/fs/tools/gnunet-auto-share.c:172
#: src/applications/fs/tools/gnunet-insert.c:293
msgid "specify the priority of the content"
msgstr "especifica la prioridad del contenido"
-#: src/applications/fs/tools/gnunet-auto-share.c:267
+#: src/applications/fs/tools/gnunet-auto-share.c:517
#, c-format
msgid "Unknown keyword type `%s' in metadata configuration\n"
msgstr ""
-#: src/applications/fs/tools/gnunet-auto-share.c:559
+#: src/applications/fs/tools/gnunet-auto-share.c:841
#, fuzzy, c-format
-msgid "You must specify one and only one directory for sharing.\n"
+msgid "You must specify at least one directory for sharing.\n"
msgstr "Debes especificar uno y solo un fichero para desindexar.\n"
#: src/applications/fs/tools/gnunet-insert.c:113
@@ -2947,11 +2947,11 @@
msgid "File stored as `%s'.\n"
msgstr "Fichero almacenado en '%s'.\n"
-#: src/applications/fs/uritrack/file_info.c:134
+#: src/applications/fs/uritrack/file_info.c:102
msgid "Collecting file identifiers disabled.\n"
msgstr "Recolección de identificadores de fichero desactivada.\n"
-#: src/applications/fs/uritrack/file_info.c:413
+#: src/applications/fs/uritrack/file_info.c:381
#, c-format
msgid "Deleted corrupt URI database in `%s'."
msgstr "Borrada base de datos de URIs corrupta en '%s'."
@@ -2975,24 +2975,24 @@
msgid "Cannot hash `%s'.\n"
msgstr "Imposible hallar el hash de '%s'.\n"
-#: src/applications/fs/ecrs/upload.c:206
+#: src/applications/fs/ecrs/upload.c:216
#, c-format
msgid "Initialization for indexing file `%s' failed.\n"
msgstr ""
"Durante la inicialización de la indexación del fichero '%s' se produjo un "
"fallo.\n"
-#: src/applications/fs/ecrs/upload.c:214
-#, c-format
-msgid "Indexing file `%s' failed. Trying to insert file...\n"
+#: src/applications/fs/ecrs/upload.c:224
+#, fuzzy, c-format
+msgid "Indexing file `%s' failed. Suggestion: try to insert the file.\n"
msgstr "Indexación del fichero '%s' fallida. Intentando insertar fichero...\n"
-#: src/applications/fs/ecrs/upload.c:228
+#: src/applications/fs/ecrs/upload.c:238
#, fuzzy, c-format
msgid "Cannot open file `%s': `%s'"
msgstr "Imposible abrir el fichero de configuración '%s'.\n"
-#: src/applications/fs/ecrs/upload.c:313
+#: src/applications/fs/ecrs/upload.c:323
#, fuzzy, c-format
msgid "Indexing data of file `%s' failed at position %llu.\n"
msgstr "La indexación de los datos falló en la posición %i.\n"
@@ -3024,11 +3024,11 @@
"Tipo de metadatos desconocido en la opción de metadatos '%s'. Usando el "
"tipo de metadatos 'desconocido' en su lugar.\n"
-#: src/applications/fs/ecrs/search.c:150
+#: src/applications/fs/ecrs/search.c:153
msgid "CHK URI not allowed for search.\n"
msgstr "CHK URI no autorizado para buscar.\n"
-#: src/applications/fs/ecrs/search.c:205
+#: src/applications/fs/ecrs/search.c:208
msgid "LOC URI not allowed for search.\n"
msgstr "LOC URI no autorizado para buscar.\n"
@@ -3057,7 +3057,7 @@
msgid "Format of file `%s' is invalid, trying to remove.\n"
msgstr "El formato del fichero '%s' no es válido.\n"
-#: src/applications/fs/ecrs/download.c:600
+#: src/applications/fs/ecrs/download.c:610
msgid ""
"Decrypted content does not match key. This is either a bug or a maliciously "
"inserted file. Download aborted.\n"
@@ -3065,18 +3065,23 @@
"El contenido desencriptado no encuentra una clave. Esto puede ser un bug o "
"un fichero introducido maliciosamente. Descarga abortada.\n"
-#: src/applications/fs/ecrs/download.c:610
+#: src/applications/fs/ecrs/download.c:620
msgid "IO error."
msgstr ""
-#: src/applications/fs/collection/collection.c:567
-#: src/applications/fs/collection/collection.c:570
+#: src/applications/fs/collection/collection.c:557
+#: src/applications/fs/collection/collection.c:560
#, c-format
msgid "Revision %u"
msgstr ""
-#: src/applications/fs/fsui/upload.c:331
+#: src/applications/fs/fsui/upload.c:321
#, fuzzy
+msgid "Application aborted."
+msgstr "_Opciones"
+
+#: src/applications/fs/fsui/upload.c:335
+#, fuzzy
msgid "Failed to create temporary directory."
msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
@@ -3111,31 +3116,31 @@
msgid "Datastore full.\n"
msgstr ""
-#: src/applications/fs/gap/fs.c:784
+#: src/applications/fs/gap/fs.c:815
msgid "# gap requests total received"
msgstr ""
-#: src/applications/fs/gap/fs.c:786
+#: src/applications/fs/gap/fs.c:817
#, fuzzy
msgid "# gap requests dropped due to load"
msgstr "# Anuncios de los pares recibidos"
-#: src/applications/fs/gap/fs.c:788
+#: src/applications/fs/gap/fs.c:819
msgid "# gap content total received"
msgstr ""
-#: src/applications/fs/gap/fs.c:790
+#: src/applications/fs/gap/fs.c:821
msgid "# gap total trust awarded"
msgstr ""
-#: src/applications/fs/gap/fs.c:818
+#: src/applications/fs/gap/fs.c:849
#, fuzzy, c-format
msgid ""
-"`%s' registering client handlers %d %d %d %d %d %d %d and P2P handlers %d %"
-"d\n"
+"`%s' registering client handlers %d %d %d %d %d %d %d %d and P2P handlers %d "
+"%d\n"
msgstr "'%s' registrando manejadores de clientes %d %d %d %d %d %d %d %d %d\n"
-#: src/applications/fs/gap/fs.c:868
+#: src/applications/fs/gap/fs.c:905
msgid "enables (anonymous) file-sharing"
msgstr "activa la compartición de ficheros anónima"
@@ -3169,26 +3174,26 @@
msgid "# total RC of interned peer IDs in pid table"
msgstr ""
-#: src/applications/fs/gap/querymanager.c:638
+#: src/applications/fs/gap/querymanager.c:708
#, fuzzy
msgid "# gap client queries received"
msgstr "# mensajes PONG encriptados recibidos"
-#: src/applications/fs/gap/querymanager.c:640
+#: src/applications/fs/gap/querymanager.c:710
msgid "# gap replies sent to clients"
msgstr ""
-#: src/applications/fs/gap/querymanager.c:642
+#: src/applications/fs/gap/querymanager.c:712
#, fuzzy
msgid "# gap client requests tracked"
msgstr "# mensajes PONG encriptados recibidos"
-#: src/applications/fs/gap/querymanager.c:644
+#: src/applications/fs/gap/querymanager.c:714
#, fuzzy
msgid "# gap client requests injected"
msgstr "# mensajes PONG encriptados recibidos"
-#: src/applications/fs/gap/querymanager.c:647
+#: src/applications/fs/gap/querymanager.c:717
msgid "# gap query bloomfilter resizing updates"
msgstr ""
@@ -3795,7 +3800,7 @@
msgid "run in client mode (for getting client configuration values)"
msgstr ""
-#: src/server/version.c:143
+#: src/server/version.c:129
msgid ""
"Failed to determine filename used to store GNUnet version information!\n"
msgstr ""
Modified: GNUnet/po/sv.po
===================================================================
--- GNUnet/po/sv.po 2008-06-12 05:49:44 UTC (rev 7147)
+++ GNUnet/po/sv.po 2008-06-12 06:01:44 UTC (rev 7148)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: GNUnet 0.7.0b\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2008-06-07 23:46-0600\n"
+"POT-Creation-Date: 2008-06-11 23:26-0600\n"
"PO-Revision-Date: 2006-01-21 17:16+0100\n"
"Last-Translator: Daniel Nylander <address@hidden>\n"
"Language-Team: Swedish <address@hidden>\n"
@@ -2000,7 +2000,7 @@
msgstr "\"%s(%s,%s)\" misslyckades.\n"
#: src/applications/dht/tools/dht-query.c:141
-#: src/applications/fs/tools/gnunet-auto-share.c:370
+#: src/applications/fs/tools/gnunet-auto-share.c:624
#, c-format
msgid "Failed to connect to gnunetd.\n"
msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -2282,7 +2282,7 @@
msgstr "# sessioner etablerade"
#: src/applications/fs/tools/gnunet-pseudonym.c:70
-#: src/applications/fs/tools/gnunet-auto-share.c:140
+#: src/applications/fs/tools/gnunet-auto-share.c:152
#: src/applications/fs/tools/gnunet-insert.c:249
#: src/applications/fs/tools/gnunet-search.c:125
#: src/applications/fs/tools/gnunet-download.c:77
@@ -2453,13 +2453,13 @@
msgid "Listed %d matching entries.\n"
msgstr "Listade %d matchande poster.\n"
-#: src/applications/fs/tools/gnunet-auto-share.c:101
+#: src/applications/fs/tools/gnunet-auto-share.c:113
#, fuzzy, c-format
msgid "Upload of `%s' complete, URI is `%s'.\n"
msgstr ""
"Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\n"
-#: src/applications/fs/tools/gnunet-auto-share.c:110
+#: src/applications/fs/tools/gnunet-auto-share.c:122
#: src/applications/fs/tools/gnunet-insert.c:223
#, fuzzy, c-format
msgid ""
@@ -2467,7 +2467,7 @@
"Upload aborted.\n"
msgstr "Nedladdning avbruten."
-#: src/applications/fs/tools/gnunet-auto-share.c:116
+#: src/applications/fs/tools/gnunet-auto-share.c:128
#: src/applications/fs/tools/gnunet-insert.c:228
#, fuzzy, c-format
msgid ""
@@ -2477,7 +2477,7 @@
"\n"
"Fel vid uppladdning av fil: %s\n"
-#: src/applications/fs/tools/gnunet-auto-share.c:127
+#: src/applications/fs/tools/gnunet-auto-share.c:139
#: src/applications/fs/tools/gnunet-insert.c:237
#, c-format
msgid ""
@@ -2485,13 +2485,13 @@
"Unexpected event: %d\n"
msgstr ""
-#: src/applications/fs/tools/gnunet-auto-share.c:144
+#: src/applications/fs/tools/gnunet-auto-share.c:156
msgid ""
"run in debug mode; gnunet-auto-share will not daemonize and error messages "
"will be written to stderr instead of a logfile"
msgstr ""
-#: src/applications/fs/tools/gnunet-auto-share.c:150
+#: src/applications/fs/tools/gnunet-auto-share.c:162
#: src/applications/fs/tools/gnunet-insert.c:262
#, fuzzy
msgid ""
@@ -2501,30 +2501,30 @@
"använd libextractor för att lägga till ytterligare direktreferenser till "
"katalogposter"
-#: src/applications/fs/tools/gnunet-auto-share.c:152
+#: src/applications/fs/tools/gnunet-auto-share.c:164
msgid "Automatically share a directory."
msgstr ""
-#: src/applications/fs/tools/gnunet-auto-share.c:155
+#: src/applications/fs/tools/gnunet-auto-share.c:167
#: src/applications/fs/tools/gnunet-insert.c:276
msgid ""
"add an additional keyword for all files and directories (this option can be "
"specified multiple times)"
msgstr ""
-#: src/applications/fs/tools/gnunet-auto-share.c:160
+#: src/applications/fs/tools/gnunet-auto-share.c:172
#: src/applications/fs/tools/gnunet-insert.c:293
msgid "specify the priority of the content"
msgstr "ange prioritet för innehållet"
-#: src/applications/fs/tools/gnunet-auto-share.c:267
+#: src/applications/fs/tools/gnunet-auto-share.c:517
#, c-format
msgid "Unknown keyword type `%s' in metadata configuration\n"
msgstr ""
-#: src/applications/fs/tools/gnunet-auto-share.c:559
+#: src/applications/fs/tools/gnunet-auto-share.c:841
#, fuzzy, c-format
-msgid "You must specify one and only one directory for sharing.\n"
+msgid "You must specify at least one directory for sharing.\n"
msgstr "Du måste ange en och endast en fil att avindexera.\n"
#: src/applications/fs/tools/gnunet-insert.c:113
@@ -2805,11 +2805,11 @@
msgid "File stored as `%s'.\n"
msgstr "Fil lagrad som \"%s\".\n"
-#: src/applications/fs/uritrack/file_info.c:134
+#: src/applications/fs/uritrack/file_info.c:102
msgid "Collecting file identifiers disabled.\n"
msgstr ""
-#: src/applications/fs/uritrack/file_info.c:413
+#: src/applications/fs/uritrack/file_info.c:381
#, c-format
msgid "Deleted corrupt URI database in `%s'."
msgstr ""
@@ -2834,22 +2834,22 @@
msgid "Cannot hash `%s'.\n"
msgstr ""
-#: src/applications/fs/ecrs/upload.c:206
+#: src/applications/fs/ecrs/upload.c:216
#, c-format
msgid "Initialization for indexing file `%s' failed.\n"
msgstr "Initiering av indexering av fil \"%s\" misslyckades.\n"
-#: src/applications/fs/ecrs/upload.c:214
-#, c-format
-msgid "Indexing file `%s' failed. Trying to insert file...\n"
+#: src/applications/fs/ecrs/upload.c:224
+#, fuzzy, c-format
+msgid "Indexing file `%s' failed. Suggestion: try to insert the file.\n"
msgstr "Indexering av fil \"%s\" misslyckades. Försöker att infoga fil...\n"
-#: src/applications/fs/ecrs/upload.c:228
+#: src/applications/fs/ecrs/upload.c:238
#, fuzzy, c-format
msgid "Cannot open file `%s': `%s'"
msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
-#: src/applications/fs/ecrs/upload.c:313
+#: src/applications/fs/ecrs/upload.c:323
#, fuzzy, c-format
msgid "Indexing data of file `%s' failed at position %llu.\n"
msgstr "Indexering av data misslyckades vid position %i.\n"
@@ -2879,11 +2879,11 @@
"`unknown' instead.\n"
msgstr ""
-#: src/applications/fs/ecrs/search.c:150
+#: src/applications/fs/ecrs/search.c:153
msgid "CHK URI not allowed for search.\n"
msgstr "CHK URI tillåts inte för sökning.\n"
-#: src/applications/fs/ecrs/search.c:205
+#: src/applications/fs/ecrs/search.c:208
msgid "LOC URI not allowed for search.\n"
msgstr "LOC URI tillåts inte för sökning.\n"
@@ -2912,7 +2912,7 @@
msgid "Format of file `%s' is invalid, trying to remove.\n"
msgstr "Formatet på filen \"%s\" är ogiltig.\n"
-#: src/applications/fs/ecrs/download.c:600
+#: src/applications/fs/ecrs/download.c:610
msgid ""
"Decrypted content does not match key. This is either a bug or a maliciously "
"inserted file. Download aborted.\n"
@@ -2920,17 +2920,22 @@
"Dekrypterat innehåll stämmer inte med nyckeln. Det är antingen ett fel eller "
"en fil inlagd med onda avsikter. Hämtning avbruten.\n"
-#: src/applications/fs/ecrs/download.c:610
+#: src/applications/fs/ecrs/download.c:620
msgid "IO error."
msgstr ""
-#: src/applications/fs/collection/collection.c:567
-#: src/applications/fs/collection/collection.c:570
+#: src/applications/fs/collection/collection.c:557
+#: src/applications/fs/collection/collection.c:560
#, c-format
msgid "Revision %u"
msgstr ""
-#: src/applications/fs/fsui/upload.c:331
+#: src/applications/fs/fsui/upload.c:321
+#, fuzzy
+msgid "Application aborted."
+msgstr "_Alternativ"
+
+#: src/applications/fs/fsui/upload.c:335
msgid "Failed to create temporary directory."
msgstr ""
@@ -2963,30 +2968,30 @@
msgid "Datastore full.\n"
msgstr ""
-#: src/applications/fs/gap/fs.c:784
+#: src/applications/fs/gap/fs.c:815
msgid "# gap requests total received"
msgstr ""
-#: src/applications/fs/gap/fs.c:786
+#: src/applications/fs/gap/fs.c:817
msgid "# gap requests dropped due to load"
msgstr ""
-#: src/applications/fs/gap/fs.c:788
+#: src/applications/fs/gap/fs.c:819
msgid "# gap content total received"
msgstr ""
-#: src/applications/fs/gap/fs.c:790
+#: src/applications/fs/gap/fs.c:821
msgid "# gap total trust awarded"
msgstr ""
-#: src/applications/fs/gap/fs.c:818
+#: src/applications/fs/gap/fs.c:849
#, fuzzy, c-format
msgid ""
-"`%s' registering client handlers %d %d %d %d %d %d %d and P2P handlers %d %"
-"d\n"
+"`%s' registering client handlers %d %d %d %d %d %d %d %d and P2P handlers %d "
+"%d\n"
msgstr "\"%s\" registrerar klienthandtagen %d och %d\n"
-#: src/applications/fs/gap/fs.c:868
+#: src/applications/fs/gap/fs.c:905
msgid "enables (anonymous) file-sharing"
msgstr "aktiverar (anonym) fildelning"
@@ -3016,24 +3021,24 @@
msgid "# total RC of interned peer IDs in pid table"
msgstr ""
-#: src/applications/fs/gap/querymanager.c:638
+#: src/applications/fs/gap/querymanager.c:708
#, fuzzy
msgid "# gap client queries received"
msgstr "# klartext PONG-meddelanden mottagna"
-#: src/applications/fs/gap/querymanager.c:640
+#: src/applications/fs/gap/querymanager.c:710
msgid "# gap replies sent to clients"
msgstr ""
-#: src/applications/fs/gap/querymanager.c:642
+#: src/applications/fs/gap/querymanager.c:712
msgid "# gap client requests tracked"
msgstr ""
-#: src/applications/fs/gap/querymanager.c:644
+#: src/applications/fs/gap/querymanager.c:714
msgid "# gap client requests injected"
msgstr ""
-#: src/applications/fs/gap/querymanager.c:647
+#: src/applications/fs/gap/querymanager.c:717
msgid "# gap query bloomfilter resizing updates"
msgstr ""
@@ -3636,7 +3641,7 @@
msgid "run in client mode (for getting client configuration values)"
msgstr "kör i klientläge (för att hämta värden från klientkonfiguration)"
-#: src/server/version.c:143
+#: src/server/version.c:129
msgid ""
"Failed to determine filename used to store GNUnet version information!\n"
msgstr ""
Modified: GNUnet/po/vi.po
===================================================================
--- GNUnet/po/vi.po 2008-06-12 05:49:44 UTC (rev 7147)
+++ GNUnet/po/vi.po 2008-06-12 06:01:44 UTC (rev 7148)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: gnunet 0.8.0pre1\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2008-06-07 23:46-0600\n"
+"POT-Creation-Date: 2008-06-11 23:26-0600\n"
"PO-Revision-Date: 2008-06-03 17:00+0930\n"
"Last-Translator: Clytie Siddall <address@hidden>\n"
"Language-Team: Vietnamese <address@hidden>\n"
@@ -2060,7 +2060,7 @@
msgstr "« %s(%s,%s) » bị lỗi.\n"
#: src/applications/dht/tools/dht-query.c:141
-#: src/applications/fs/tools/gnunet-auto-share.c:370
+#: src/applications/fs/tools/gnunet-auto-share.c:624
#, c-format
msgid "Failed to connect to gnunetd.\n"
msgstr "Lỗi kết nối đến gnunetd.\n"
@@ -2349,7 +2349,7 @@
msgstr "# các phiên chạy được thiết lập"
#: src/applications/fs/tools/gnunet-pseudonym.c:70
-#: src/applications/fs/tools/gnunet-auto-share.c:140
+#: src/applications/fs/tools/gnunet-auto-share.c:152
#: src/applications/fs/tools/gnunet-insert.c:249
#: src/applications/fs/tools/gnunet-search.c:125
#: src/applications/fs/tools/gnunet-download.c:77
@@ -2524,12 +2524,12 @@
msgid "Listed %d matching entries.\n"
msgstr "Đã liệt kê %d mục nhập tương ứng.\n"
-#: src/applications/fs/tools/gnunet-auto-share.c:101
+#: src/applications/fs/tools/gnunet-auto-share.c:113
#, c-format
msgid "Upload of `%s' complete, URI is `%s'.\n"
msgstr "Tải lên « %s » hoàn thành, địa chỉ URI là « %s ».\n"
-#: src/applications/fs/tools/gnunet-auto-share.c:110
+#: src/applications/fs/tools/gnunet-auto-share.c:122
#: src/applications/fs/tools/gnunet-insert.c:223
#, c-format
msgid ""
@@ -2539,7 +2539,7 @@
"\n"
"Tải lên bị hủy bỏ.\n"
-#: src/applications/fs/tools/gnunet-auto-share.c:116
+#: src/applications/fs/tools/gnunet-auto-share.c:128
#: src/applications/fs/tools/gnunet-insert.c:228
#, c-format
msgid ""
@@ -2549,7 +2549,7 @@
"\n"
"Gặp lỗi khi tải lên tập tin: %s"
-#: src/applications/fs/tools/gnunet-auto-share.c:127
+#: src/applications/fs/tools/gnunet-auto-share.c:139
#: src/applications/fs/tools/gnunet-insert.c:237
#, c-format
msgid ""
@@ -2559,7 +2559,7 @@
"\n"
"Gặp sự kiện bất thường: %d\n"
-#: src/applications/fs/tools/gnunet-auto-share.c:144
+#: src/applications/fs/tools/gnunet-auto-share.c:156
msgid ""
"run in debug mode; gnunet-auto-share will not daemonize and error messages "
"will be written to stderr instead of a logfile"
@@ -2568,7 +2568,7 @@
"nền và sẽ ghi thông báo lỗi ra đầu lỗi tiêu chuẩn thay vì vào một tập tin "
"ghi sự kiện."
-#: src/applications/fs/tools/gnunet-auto-share.c:150
+#: src/applications/fs/tools/gnunet-auto-share.c:162
#: src/applications/fs/tools/gnunet-insert.c:262
msgid ""
"do not use libextractor to add additional references to directory entries "
@@ -2577,11 +2577,11 @@
"đừng dùng libextractor để thêm các tham chiếu bổ sung vào mục nhập thư mục "
"và/hay tập tin công bố"
-#: src/applications/fs/tools/gnunet-auto-share.c:152
+#: src/applications/fs/tools/gnunet-auto-share.c:164
msgid "Automatically share a directory."
msgstr "Tự động chia sẻ một thư mục."
-#: src/applications/fs/tools/gnunet-auto-share.c:155
+#: src/applications/fs/tools/gnunet-auto-share.c:167
#: src/applications/fs/tools/gnunet-insert.c:276
msgid ""
"add an additional keyword for all files and directories (this option can be "
@@ -2590,19 +2590,19 @@
"thêm một từ khóa bổ sung cho tất cả tập tin và thư mục (có thể chỉ ra tùy "
"chọn này nhiều lần)"
-#: src/applications/fs/tools/gnunet-auto-share.c:160
+#: src/applications/fs/tools/gnunet-auto-share.c:172
#: src/applications/fs/tools/gnunet-insert.c:293
msgid "specify the priority of the content"
msgstr "xác định mức ưu tiên của nội dung"
-#: src/applications/fs/tools/gnunet-auto-share.c:267
+#: src/applications/fs/tools/gnunet-auto-share.c:517
#, c-format
msgid "Unknown keyword type `%s' in metadata configuration\n"
msgstr "Không rõ kiểu từ khoá « %s » trong cấu hình siêu dữ liệu\n"
-#: src/applications/fs/tools/gnunet-auto-share.c:559
-#, c-format
-msgid "You must specify one and only one directory for sharing.\n"
+#: src/applications/fs/tools/gnunet-auto-share.c:841
+#, fuzzy, c-format
+msgid "You must specify at least one directory for sharing.\n"
msgstr "Phải ghi rõ chỉ một thư mục để chia sẻ.\n"
#: src/applications/fs/tools/gnunet-insert.c:113
@@ -2896,11 +2896,11 @@
msgid "File stored as `%s'.\n"
msgstr "Tập tin được lưu dạng « %s ».\n"
-#: src/applications/fs/uritrack/file_info.c:134
+#: src/applications/fs/uritrack/file_info.c:102
msgid "Collecting file identifiers disabled.\n"
msgstr "Chức năng thu thập các đồ nhận diện tập tin đã bị tắt.\n"
-#: src/applications/fs/uritrack/file_info.c:413
+#: src/applications/fs/uritrack/file_info.c:381
#, c-format
msgid "Deleted corrupt URI database in `%s'."
msgstr "Đã xoá cơ sở dữ liệu địa chỉ URI bị hỏng trong « %s »."
@@ -2924,22 +2924,22 @@
msgid "Cannot hash `%s'.\n"
msgstr "Không thể tạo mẫu duy nhất đại diện cho « %s ».\n"
-#: src/applications/fs/ecrs/upload.c:206
+#: src/applications/fs/ecrs/upload.c:216
#, c-format
msgid "Initialization for indexing file `%s' failed.\n"
msgstr "Lỗi sơ khởi tập tin đánh chỉ mục « %s ».\n"
-#: src/applications/fs/ecrs/upload.c:214
-#, c-format
-msgid "Indexing file `%s' failed. Trying to insert file...\n"
+#: src/applications/fs/ecrs/upload.c:224
+#, fuzzy, c-format
+msgid "Indexing file `%s' failed. Suggestion: try to insert the file.\n"
msgstr "Lỗi đánh chỉ mục tập tin « %s ». Đang thử chèn tập tin...\n"
-#: src/applications/fs/ecrs/upload.c:228
+#: src/applications/fs/ecrs/upload.c:238
#, c-format
msgid "Cannot open file `%s': `%s'"
msgstr "Không thể mở tập tin « %s »: « %s »"
-#: src/applications/fs/ecrs/upload.c:313
+#: src/applications/fs/ecrs/upload.c:323
#, c-format
msgid "Indexing data of file `%s' failed at position %llu.\n"
msgstr "Đánh chỉ mục dữ liệu của tập tin « %s » bị lỗi tại vị tri %llu.\n"
@@ -2971,11 +2971,11 @@
"Không rõ kiểu siêu dữ liệu trong tùy chọn siêu dữ liệu « %s ». Đang ùng kiểu "
"siêu dữ liệu « không rõ » (unknown) để thay thế.\n"
-#: src/applications/fs/ecrs/search.c:150
+#: src/applications/fs/ecrs/search.c:153
msgid "CHK URI not allowed for search.\n"
msgstr "Không cho phép địa chỉ URI CHK khi tìm kiếm.\n"
-#: src/applications/fs/ecrs/search.c:205
+#: src/applications/fs/ecrs/search.c:208
msgid "LOC URI not allowed for search.\n"
msgstr "Không cho phép địa chỉ URI LOC khi tìm kiếm.\n"
@@ -3004,7 +3004,7 @@
msgid "Format of file `%s' is invalid, trying to remove.\n"
msgstr "Định dạng của tập tin « %s » là không hợp lệ nên thử gỡ bỏ.\n"
-#: src/applications/fs/ecrs/download.c:600
+#: src/applications/fs/ecrs/download.c:610
msgid ""
"Decrypted content does not match key. This is either a bug or a maliciously "
"inserted file. Download aborted.\n"
@@ -3012,17 +3012,24 @@
"Nội dung đã giải mã không tương ứng chìa khóa. Đây là một lỗi hoặc một tập "
"tin chèn vào với ý xấu. Tiến trình tải xuống bị hủy bỏ.\n"
-#: src/applications/fs/ecrs/download.c:610
+#: src/applications/fs/ecrs/download.c:620
msgid "IO error."
msgstr "Lỗi VR."
-#: src/applications/fs/collection/collection.c:567
-#: src/applications/fs/collection/collection.c:570
+#: src/applications/fs/collection/collection.c:557
+#: src/applications/fs/collection/collection.c:560
#, c-format
msgid "Revision %u"
msgstr ""
-#: src/applications/fs/fsui/upload.c:331
+#: src/applications/fs/fsui/upload.c:321
+#, fuzzy
+msgid "Application aborted."
+msgstr ""
+"\n"
+"Tải lên bị hủy bỏ.\n"
+
+#: src/applications/fs/fsui/upload.c:335
msgid "Failed to create temporary directory."
msgstr "Lỗi tạo thư mục tạm thời."
@@ -3055,32 +3062,32 @@
msgid "Datastore full.\n"
msgstr "Kho dữ liệu đầy.\n"
-#: src/applications/fs/gap/fs.c:784
+#: src/applications/fs/gap/fs.c:815
msgid "# gap requests total received"
msgstr "# tổng số yêu cầu lỗ hổng được nhận"
-#: src/applications/fs/gap/fs.c:786
+#: src/applications/fs/gap/fs.c:817
msgid "# gap requests dropped due to load"
msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
-#: src/applications/fs/gap/fs.c:788
+#: src/applications/fs/gap/fs.c:819
msgid "# gap content total received"
msgstr "# tổng số nội dung lỗ hổng được nhận"
-#: src/applications/fs/gap/fs.c:790
+#: src/applications/fs/gap/fs.c:821
msgid "# gap total trust awarded"
msgstr "# tổng số tin cậy lỗ hổng được cấp"
-#: src/applications/fs/gap/fs.c:818
-#, c-format
+#: src/applications/fs/gap/fs.c:849
+#, fuzzy, c-format
msgid ""
-"`%s' registering client handlers %d %d %d %d %d %d %d and P2P handlers %d %"
-"d\n"
+"`%s' registering client handlers %d %d %d %d %d %d %d %d and P2P handlers %d "
+"%d\n"
msgstr ""
"« %s » đang đăng ký các trình điều khiển kiểu máy/trình khách %d %d %d %d %d
%"
"d %d và kiểu PHP %d %d\n"
-#: src/applications/fs/gap/fs.c:868
+#: src/applications/fs/gap/fs.c:905
msgid "enables (anonymous) file-sharing"
msgstr "hiệu lực chia sẻ tập tin (nặc danh)"
@@ -3115,23 +3122,23 @@
msgid "# total RC of interned peer IDs in pid table"
msgstr "# tổng số RC của mã số đồng đẳng bị giam giữ trong bảng PID"
-#: src/applications/fs/gap/querymanager.c:638
+#: src/applications/fs/gap/querymanager.c:708
msgid "# gap client queries received"
msgstr "# các yêu cầu khách lỗ hổng được nhận"
-#: src/applications/fs/gap/querymanager.c:640
+#: src/applications/fs/gap/querymanager.c:710
msgid "# gap replies sent to clients"
msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
-#: src/applications/fs/gap/querymanager.c:642
+#: src/applications/fs/gap/querymanager.c:712
msgid "# gap client requests tracked"
msgstr "# các yêu cầu máy/trình khách lỗ hổng được theo dõi"
-#: src/applications/fs/gap/querymanager.c:644
+#: src/applications/fs/gap/querymanager.c:714
msgid "# gap client requests injected"
msgstr "# các yêu cầu máy/trình khách lỗ hổng được phun vào"
-#: src/applications/fs/gap/querymanager.c:647
+#: src/applications/fs/gap/querymanager.c:717
msgid "# gap query bloomfilter resizing updates"
msgstr ""
"# các bản cập nhật thay đổi kích cỡ bộ lọc bloomfilter truy vấn lỗ hổng"
@@ -3741,7 +3748,7 @@
msgid "run in client mode (for getting client configuration values)"
msgstr "chạy trong chế độ khách (để lấy các giá trị cấu hình của máy khách)"
-#: src/server/version.c:143
+#: src/server/version.c:129
msgid ""
"Failed to determine filename used to store GNUnet version information!\n"
msgstr ""
Modified: GNUnet/src/applications/datastore/datastore.c
===================================================================
--- GNUnet/src/applications/datastore/datastore.c 2008-06-12 05:49:44 UTC
(rev 7147)
+++ GNUnet/src/applications/datastore/datastore.c 2008-06-12 06:01:44 UTC
(rev 7148)
@@ -389,9 +389,9 @@
stat_filter_failed =
stats->create (gettext_noop ("# bloom filter false positives"));
- stats->set (stats->
- create (gettext_noop ("# bytes allowed in datastore")),
- quota);
+ stats->
+ set (stats->create (gettext_noop ("# bytes allowed in datastore")),
+ quota);
}
state = capi->service_request ("state");
if (state != NULL)
Modified: GNUnet/src/applications/fs/collection/collection.c
===================================================================
--- GNUnet/src/applications/fs/collection/collection.c 2008-06-12 05:49:44 UTC
(rev 7147)
+++ GNUnet/src/applications/fs/collection/collection.c 2008-06-12 06:01:44 UTC
(rev 7148)
@@ -120,11 +120,7 @@
static char *
getCollectionFileName ()
{
- return GNUNET_get_home_filename(ectx,
- cfg,
- GNUNET_NO,
- COLLECTION,
- NULL);
+ return GNUNET_get_home_filename (ectx, cfg, GNUNET_NO, COLLECTION, NULL);
}
/**
@@ -156,7 +152,7 @@
}
/* read collection data */
if (GNUNET_OK != GNUNET_disk_file_size (ectx, fn, &size, GNUNET_YES))
- {
+ {
GNUNET_free (fn);
return;
}
@@ -515,12 +511,9 @@
GNUNET_OK == GNUNET_ECRS_directory_create (ectx,
&dirData,
&dirLen,
- collectionData->
- file_count,
- collectionData->
- files,
- collectionData->
- meta));
+
collectionData->file_count,
+
collectionData->files,
+
collectionData->meta));
if (-1 == WRITE (fd, dirData, dirLen))
{
GNUNET_GE_LOG_STRERROR (ectx,
@@ -534,10 +527,10 @@
GNUNET_free (dirData);
CLOSE (fd);
if (GNUNET_OK != GNUNET_ECRS_file_upload (ectx, cfg, tmpName, GNUNET_NO,
/* indexing */
- ntohl (collectionData->data.
- anonymityLevel),
- ntohl (collectionData->data.
- priority),
+ ntohl (collectionData->
+ data.anonymityLevel),
+ ntohl (collectionData->
+ data.priority),
GNUNET_get_time () +
COLLECTION_ADV_LIFETIME, NULL,
NULL, NULL, NULL, &directoryURI))
@@ -562,10 +555,10 @@
uri = GNUNET_ECRS_namespace_add_content (ectx,
cfg,
&collectionData->data.pid,
- ntohl (collectionData->data.
- anonymityLevel),
- ntohl (collectionData->data.
- priority),
+ ntohl (collectionData->
+ data.anonymityLevel),
+ ntohl (collectionData->
+ data.priority),
GNUNET_get_time () +
COLLECTION_ADV_LIFETIME,
this_revision_string,
Modified: GNUnet/src/applications/fs/ecrs/download.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/download.c 2008-06-12 05:49:44 UTC (rev
7147)
+++ GNUnet/src/applications/fs/ecrs/download.c 2008-06-12 06:01:44 UTC (rev
7148)
@@ -140,7 +140,7 @@
* The file handle.
*/
int handle;
-
+
/**
* Do we exclusively own this sctx?
*/
@@ -220,9 +220,7 @@
{
pos = rm->head;
if (rm->my_sctx != GNUNET_YES)
- GNUNET_FS_stop_search(rm->sctx,
- &content_receive_callback,
- pos);
+ GNUNET_FS_stop_search (rm->sctx, &content_receive_callback, pos);
rm->head = pos->next;
GNUNET_free (pos);
}
@@ -233,7 +231,7 @@
GNUNET_thread_release_self (rm->main);
GNUNET_free_non_null (rm->filename);
if (rm->my_sctx == GNUNET_YES)
- GNUNET_FS_destroy_search_context(rm->sctx);
+ GNUNET_FS_destroy_search_context (rm->sctx);
rm->sctx = NULL;
GNUNET_free (rm);
}
@@ -709,7 +707,7 @@
struct GNUNET_ECRS_DownloadContext *
GNUNET_ECRS_file_download_partial_start (struct GNUNET_GE_Context *ectx,
struct GNUNET_GC_Configuration *cfg,
- struct GNUNET_FS_SearchContext * sc,
+ struct GNUNET_FS_SearchContext *sc,
const struct GNUNET_ECRS_URI *uri,
const char *filename,
unsigned long long offset,
@@ -733,12 +731,12 @@
memset (rm, 0, sizeof (struct GNUNET_ECRS_DownloadContext));
if (sc == NULL)
{
- rm->sctx = GNUNET_FS_create_search_context(ectx, cfg);
+ rm->sctx = GNUNET_FS_create_search_context (ectx, cfg);
if (rm->sctx == NULL)
- {
- GNUNET_free(rm);
- return NULL;
- }
+ {
+ GNUNET_free (rm);
+ return NULL;
+ }
rm->my_sctx = GNUNET_YES;
}
else
@@ -881,14 +879,14 @@
void *ttClosure)
{
struct GNUNET_ECRS_DownloadContext *rm;
- struct GNUNET_FS_SearchContext * sc;
+ struct GNUNET_FS_SearchContext *sc;
int ret;
if (length == 0)
return GNUNET_OK;
rm = GNUNET_ECRS_file_download_partial_start (ectx,
cfg,
- NULL,
+ NULL,
uri,
filename,
offset,
@@ -898,7 +896,7 @@
dpcb, dpcbClosure);
if (rm == NULL)
{
- GNUNET_FS_destroy_search_context(sc);
+ GNUNET_FS_destroy_search_context (sc);
return GNUNET_SYSERR;
}
while ((GNUNET_OK == tt (ttClosure)) &&
Modified: GNUnet/src/applications/fs/ecrs/namespace.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/namespace.c 2008-06-12 05:49:44 UTC (rev
7147)
+++ GNUnet/src/applications/fs/ecrs/namespace.c 2008-06-12 06:01:44 UTC (rev
7148)
@@ -309,8 +309,8 @@
sizeof (unsigned
int),
&ksb->sblock,
- &ksb->kblock.
- signature));
+ &ksb->
+ kblock.signature));
/* extra check: verify sig */
GNUNET_RSA_free_key (pk);
if (GNUNET_OK != GNUNET_FS_insert (sock, knvalue))
Modified: GNUnet/src/applications/fs/ecrs/search.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/search.c 2008-06-12 05:49:44 UTC (rev
7147)
+++ GNUnet/src/applications/fs/ecrs/search.c 2008-06-12 06:01:44 UTC (rev
7148)
@@ -100,9 +100,8 @@
static int
receive_response_callback (const GNUNET_HashCode * key,
- const GNUNET_DatastoreValue * value,
- void *cls,
- unsigned long long uid);
+ const GNUNET_DatastoreValue * value,
+ void *cls, unsigned long long uid);
/**
* Add a query to the SQC.
@@ -291,9 +290,8 @@
*/
static int
receive_response_callback (const GNUNET_HashCode * key,
- const GNUNET_DatastoreValue * value,
- void *cls,
- unsigned long long uid)
+ const GNUNET_DatastoreValue * value,
+ void *cls, unsigned long long uid)
{
struct PendingSearch *ps = cls;
struct GNUNET_ECRS_SearchContext *sqc = ps->context;
@@ -463,7 +461,7 @@
struct GNUNET_ECRS_SearchContext *
GNUNET_ECRS_search_start (struct GNUNET_GE_Context *ectx,
struct GNUNET_GC_Configuration *cfg,
- struct GNUNET_FS_SearchContext * sc,
+ struct GNUNET_FS_SearchContext *sc,
const struct GNUNET_ECRS_URI *uri,
unsigned int anonymityLevel,
GNUNET_ECRS_SearchResultProcessor spcb,
@@ -516,10 +514,8 @@
{
pos = ctx->queries;
ctx->queries = pos->next;
- if (! ctx->my_sctx)
- GNUNET_FS_stop_search(ctx->sctx,
- &receive_response_callback,
- pos);
+ if (!ctx->my_sctx)
+ GNUNET_FS_stop_search (ctx->sctx, &receive_response_callback, pos);
GNUNET_free (pos);
}
if (ctx->my_sctx)
@@ -547,8 +543,7 @@
ctx =
GNUNET_ECRS_search_start (ectx, cfg, NULL,
- uri, anonymityLevel, spcb,
- spcbClosure);
+ uri, anonymityLevel, spcb, spcbClosure);
if (ctx == NULL)
return GNUNET_SYSERR;
while (((NULL == tt) || (GNUNET_OK == tt (ttClosure)))
Modified: GNUnet/src/applications/fs/ecrs/upload.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/upload.c 2008-06-12 05:49:44 UTC (rev
7147)
+++ GNUnet/src/applications/fs/ecrs/upload.c 2008-06-12 06:01:44 UTC (rev
7148)
@@ -189,12 +189,11 @@
GNUNET_client_connection_destroy (sock);
return GNUNET_SYSERR;
}
- if (GNUNET_YES == GNUNET_FS_test_indexed(sock,
- &fileId))
- {
- /* file already indexed; simulate only to get the URI! */
- doIndex = GNUNET_SYSERR;
- }
+ if (GNUNET_YES == GNUNET_FS_test_indexed (sock, &fileId))
+ {
+ /* file already indexed; simulate only to get the URI! */
+ doIndex = GNUNET_SYSERR;
+ }
}
if (doIndex == GNUNET_YES)
{
@@ -223,7 +222,7 @@
_
("Indexing file `%s' failed. Suggestion: try to
insert the file.\n"),
filename);
- GNUNET_client_connection_destroy (sock);
+ GNUNET_client_connection_destroy (sock);
return GNUNET_SYSERR;
default:
break;
Modified: GNUnet/src/applications/fs/fsui/download.c
===================================================================
--- GNUnet/src/applications/fs/fsui/download.c 2008-06-12 05:49:44 UTC (rev
7147)
+++ GNUnet/src/applications/fs/fsui/download.c 2008-06-12 06:01:44 UTC (rev
7148)
@@ -440,21 +440,21 @@
list->state = GNUNET_FSUI_ACTIVE;
list->startTime = GNUNET_get_time () - list->runTime;
list->handle =
- GNUNET_ECRS_file_download_partial_start (list->ctx->ectx,
- list->ctx->cfg,
- NULL,
- list->fi.uri,
- list->filename, 0,
- GNUNET_ECRS_uri_get_file_size
- (list->fi.uri),
- list->anonymityLevel,
- GNUNET_NO,
- &downloadProgressCallback,
- list);
+ GNUNET_ECRS_file_download_partial_start (list->ctx->ectx,
+ list->ctx->cfg,
+ NULL,
+ list->fi.uri,
+ list->filename, 0,
+ GNUNET_ECRS_uri_get_file_size
+ (list->fi.uri),
+ list->anonymityLevel,
+ GNUNET_NO,
+ &downloadProgressCallback,
+ list);
if (list->handle != NULL)
- list->ctx->activeDownloadThreads++;
+ list->ctx->activeDownloadThreads++;
else
- list->state = GNUNET_FSUI_ERROR_JOINED;
+ list->state = GNUNET_FSUI_ERROR_JOINED;
}
/* should this one be stopped? */
@@ -472,7 +472,7 @@
#endif
list->state = GNUNET_FSUI_SUSPENDING;
GNUNET_GE_ASSERT (ectx, list->handle != NULL);
- GNUNET_ECRS_file_download_partial_stop (list->handle);
+ GNUNET_ECRS_file_download_partial_stop (list->handle);
list->handle = NULL;
list->ctx->activeDownloadThreads--;
list->state = GNUNET_FSUI_PENDING;
Modified: GNUnet/src/applications/fs/fsui/fsui.c
===================================================================
--- GNUnet/src/applications/fs/fsui/fsui.c 2008-06-12 05:49:44 UTC (rev
7147)
+++ GNUnet/src/applications/fs/fsui/fsui.c 2008-06-12 06:01:44 UTC (rev
7148)
@@ -178,13 +178,11 @@
srl->test_download
= GNUNET_ECRS_file_download_partial_start (ctx->ectx,
ctx->cfg,
-
sl->probe_context,
+ sl->
+ probe_context,
srl->fi.uri,
- NULL,
- off,
- len,
- 1,
- GNUNET_YES,
+ NULL, off, len,
+ 1, GNUNET_YES,
&test_download_progress,
srl);
if (srl->test_download != NULL)
@@ -349,9 +347,9 @@
unsigned int *ap_ranks;
char *fn;
unsigned long long size;
-
+
GNUNET_GE_ASSERT (ectx, cfg != NULL);
- ret = GNUNET_malloc (sizeof (GNUNET_FSUI_Context));
+ ret = GNUNET_malloc (sizeof (GNUNET_FSUI_Context));
memset (ret, 0, sizeof (GNUNET_FSUI_Context));
ret->activeDownloads.state = GNUNET_FSUI_PENDING; /* !? */
ret->activeDownloads.ctx = ret;
@@ -362,21 +360,14 @@
if (ret->threadPoolSize == 0)
ret->threadPoolSize = 32;
ret->activeDownloadThreads = 0;
- ret->name = GNUNET_get_home_filename(ectx,
- cfg,
- GNUNET_NO,
- "fsui",
- name,
- NULL);
+ ret->name = GNUNET_get_home_filename (ectx,
+ cfg, GNUNET_NO, "fsui", name, NULL);
/* 1) read state in */
if (doResume)
{
- fn = GNUNET_get_home_filename(ectx,
- cfg,
- GNUNET_NO,
- "fsui-locks",
- name,
- NULL);
+ fn = GNUNET_get_home_filename (ectx,
+ cfg,
+ GNUNET_NO, "fsui-locks", name, NULL);
ret->ipc = GNUNET_IPC_semaphore_create (ectx, fn, 1);
#if DEBUG_PERSISTENCE
GNUNET_GE_LOG (ectx,
@@ -389,7 +380,7 @@
GNUNET_GE_INFO | GNUNET_GE_REQUEST | GNUNET_GE_USER,
"Aquired IPC lock.\n");
#endif
- GNUNET_free(fn);
+ GNUNET_free (fn);
GNUNET_FSUI_deserialize (ret);
}
else
@@ -484,9 +475,8 @@
list = ret->activeSearches;
while (list != NULL)
{
- list->probe_context
- = GNUNET_FS_create_search_context(ret->ectx,
- ret->cfg);
+ list->probe_context
+ = GNUNET_FS_create_search_context (ret->ectx, ret->cfg);
if (list->state == GNUNET_FSUI_PENDING)
{
list->state = GNUNET_FSUI_ACTIVE;
@@ -495,7 +485,7 @@
{
rec->search = GNUNET_ECRS_search_start (list->ctx->ectx,
list->ctx->cfg,
- list->probe_context,
+ list->probe_context,
rec->uri,
list->anonymityLevel,
&GNUNET_FSUI_search_progress_callback,
@@ -732,10 +722,10 @@
spos->state++; /* _JOINED */
}
if (spos->probe_context != NULL)
- {
- GNUNET_FS_destroy_search_context(spos->probe_context);
- spos->probe_context = NULL;
- }
+ {
+ GNUNET_FS_destroy_search_context (spos->probe_context);
+ spos->probe_context = NULL;
+ }
spos = spos->next;
}
/* 1c) stop unindexing */
Modified: GNUnet/src/applications/fs/fsui/search.c
===================================================================
--- GNUnet/src/applications/fs/fsui/search.c 2008-06-12 05:49:44 UTC (rev
7147)
+++ GNUnet/src/applications/fs/fsui/search.c 2008-06-12 06:01:44 UTC (rev
7148)
@@ -239,7 +239,7 @@
srl->search =
GNUNET_ECRS_search_start (pos->ctx->ectx,
pos->ctx->cfg,
- pos->probe_context,
+ pos->probe_context,
srl->uri,
pos->anonymityLevel,
&GNUNET_FSUI_search_progress_callback, pos);
@@ -266,15 +266,14 @@
struct GNUNET_GE_Context *ectx;
GNUNET_FSUI_Event event;
struct SearchRecordList *srl;
- struct GNUNET_FS_SearchContext * pc;
+ struct GNUNET_FS_SearchContext *pc;
if (!(GNUNET_ECRS_uri_test_ksk (uri) || GNUNET_ECRS_uri_test_sks (uri)))
{
GNUNET_GE_BREAK (NULL, 0);
return NULL;
}
- pc = GNUNET_FS_create_search_context(ctx->ectx,
- ctx->cfg);
+ pc = GNUNET_FS_create_search_context (ctx->ectx, ctx->cfg);
if (pc == NULL)
return NULL;
ectx = ctx->ectx;
@@ -319,7 +318,7 @@
srl->uri = GNUNET_ECRS_uri_duplicate (uri);
srl->search = GNUNET_ECRS_search_start (pos->ctx->ectx,
pos->ctx->cfg,
- pos->probe_context,
+ pos->probe_context,
pos->uri,
pos->anonymityLevel,
&GNUNET_FSUI_search_progress_callback,
@@ -485,7 +484,7 @@
{
rec->search = GNUNET_ECRS_search_start (pos->ctx->ectx,
pos->ctx->cfg,
- pos->probe_context,
+ pos->probe_context,
rec->uri,
pos->anonymityLevel,
&GNUNET_FSUI_search_progress_callback,
@@ -578,7 +577,7 @@
}
GNUNET_mutex_destroy (pos->lock);
if (pos->probe_context != NULL)
- GNUNET_FS_destroy_search_context(pos->probe_context);
+ GNUNET_FS_destroy_search_context (pos->probe_context);
GNUNET_free (pos);
return GNUNET_OK;
}
Modified: GNUnet/src/applications/fs/fsui/upload.c
===================================================================
--- GNUnet/src/applications/fs/fsui/upload.c 2008-06-12 05:49:44 UTC (rev
7147)
+++ GNUnet/src/applications/fs/fsui/upload.c 2008-06-12 06:01:44 UTC (rev
7148)
@@ -316,7 +316,7 @@
}
if (utc->state != GNUNET_FSUI_ACTIVE)
return NULL; /* aborted or suspended */
- if (GNUNET_shutdown_test())
+ if (GNUNET_shutdown_test ())
{
signalError (utc, _("Application aborted."));
return NULL;
@@ -430,7 +430,7 @@
pfn = p = GNUNET_malloc (tend - tpos + 1);
pfn[tend - tpos] = '\0';
memcpy (pfn, &utc->filename[tpos + 1], tend - tpos);
- /* change OS native dir separators to unix '/' and others to
'_'*/
+ /* change OS native dir separators to unix '/' and others to '_'
*/
while (*p != '\0')
{
if (*p == DIR_SEPARATOR)
Modified: GNUnet/src/applications/fs/gap/fs.c
===================================================================
--- GNUnet/src/applications/fs/gap/fs.c 2008-06-12 05:49:44 UTC (rev 7147)
+++ GNUnet/src/applications/fs/gap/fs.c 2008-06-12 06:01:44 UTC (rev 7148)
@@ -531,7 +531,7 @@
*/
static int
handle_cs_query_stop_request (struct GNUNET_ClientHandle *sock,
- const GNUNET_MessageHeader * req)
+ const GNUNET_MessageHeader * req)
{
const CS_fs_request_search_MESSAGE *rs;
unsigned int keyCount;
@@ -550,7 +550,7 @@
1 + (ntohs (req->size) -
sizeof (CS_fs_request_search_MESSAGE)) / sizeof (GNUNET_HashCode);
GNUNET_FS_QUERYMANAGER_stop_query (&rs->query[0], keyCount, anonymityLevel,
- type, sock);
+ type, sock);
return GNUNET_OK;
}
Modified: GNUnet/src/applications/fs/gap/querymanager.c
===================================================================
--- GNUnet/src/applications/fs/gap/querymanager.c 2008-06-12 05:49:44 UTC
(rev 7147)
+++ GNUnet/src/applications/fs/gap/querymanager.c 2008-06-12 06:01:44 UTC
(rev 7148)
@@ -223,10 +223,10 @@
*/
int
GNUNET_FS_QUERYMANAGER_stop_query (const GNUNET_HashCode * query,
- unsigned int key_count,
- unsigned int anonymityLevel,
- unsigned int type,
- struct GNUNET_ClientHandle *client)
+ unsigned int key_count,
+ unsigned int anonymityLevel,
+ unsigned int type,
+ struct GNUNET_ClientHandle *client)
{
struct ClientDataList *cl;
struct ClientDataList *cprev;
@@ -240,29 +240,29 @@
{
cprev = cl;
cl = cl->next;
- }
+ }
if (cl == NULL)
{
- GNUNET_mutex_unlock(GNUNET_FS_lock);
- return GNUNET_SYSERR;
- }
+ GNUNET_mutex_unlock (GNUNET_FS_lock);
+ return GNUNET_SYSERR;
+ }
rprev = NULL;
pos = cl->requests;
while (pos != NULL)
{
- if ( (pos->type == type) &&
- (pos->key_count == key_count) &&
- (0 == memcmp(query,
- &pos->queries[0],
- sizeof(GNUNET_HashCode)*key_count)) &&
- (pos->anonymityLevel == anonymityLevel) )
- break;
+ if ((pos->type == type) &&
+ (pos->key_count == key_count) &&
+ (0 == memcmp (query,
+ &pos->queries[0],
+ sizeof (GNUNET_HashCode) * key_count)) &&
+ (pos->anonymityLevel == anonymityLevel))
+ break;
rprev = pos;
pos = pos->next;
}
if (pos == NULL)
{
- GNUNET_mutex_unlock(GNUNET_FS_lock);
+ GNUNET_mutex_unlock (GNUNET_FS_lock);
return GNUNET_SYSERR;
}
if (cl->request_tail == pos)
@@ -275,13 +275,13 @@
if (stats != NULL)
stats->change (stat_gap_client_query_tracked, -1);
if (cl->requests == NULL)
- {
+ {
if (cl == clients_tail)
- clients_tail = cprev;
+ clients_tail = cprev;
if (cprev == NULL)
- clients = cl->next;
+ clients = cl->next;
else
- cprev->next = cl->next;
+ cprev->next = cl->next;
GNUNET_free (cl);
}
GNUNET_mutex_unlock (GNUNET_FS_lock);
Modified: GNUnet/src/applications/fs/gap/querymanager.h
===================================================================
--- GNUnet/src/applications/fs/gap/querymanager.h 2008-06-12 05:49:44 UTC
(rev 7147)
+++ GNUnet/src/applications/fs/gap/querymanager.h 2008-06-12 06:01:44 UTC
(rev 7148)
@@ -59,10 +59,10 @@
*/
int
GNUNET_FS_QUERYMANAGER_stop_query (const GNUNET_HashCode * query,
- unsigned int key_count,
- unsigned int anonymityLevel,
- unsigned int type,
- struct GNUNET_ClientHandle *client);
+ unsigned int key_count,
+ unsigned int anonymityLevel,
+ unsigned int type,
+ struct GNUNET_ClientHandle *client);
/**
* Handle the given response (by forwarding it to
Modified: GNUnet/src/applications/fs/lib/fslib.c
===================================================================
--- GNUnet/src/applications/fs/lib/fslib.c 2008-06-12 05:49:44 UTC (rev
7147)
+++ GNUnet/src/applications/fs/lib/fslib.c 2008-06-12 06:01:44 UTC (rev
7148)
@@ -390,10 +390,9 @@
*/
int
GNUNET_FS_stop_search (struct
- GNUNET_FS_SearchContext
- *ctx,
- GNUNET_DatastoreValueIterator
- callback, void *closure)
+ GNUNET_FS_SearchContext
+ *ctx,
+ GNUNET_DatastoreValueIterator callback, void *closure)
{
struct GNUNET_FS_SearchHandle *pos;
struct GNUNET_FS_SearchHandle *prev;
@@ -402,9 +401,8 @@
prev = NULL;
GNUNET_mutex_lock (ctx->lock);
pos = ctx->handles;
- while ( (pos != NULL) &&
- ( (pos->callback != callback) ||
- (pos->closure != closure) ) )
+ while ((pos != NULL) &&
+ ((pos->callback != callback) || (pos->closure != closure)))
{
prev = pos;
pos = pos->next;
@@ -412,17 +410,17 @@
if (pos != NULL)
{
if (prev == NULL)
- ctx->handles = pos->next;
+ ctx->handles = pos->next;
else
- prev->next = pos->next;
- /* TODO: consider sending "stop" message
- to gnunetd? */
+ prev->next = pos->next;
+ /* TODO: consider sending "stop" message
+ to gnunetd? */
req = (CS_fs_request_search_MESSAGE *) & pos[1];
req->header.type = htons (GNUNET_CS_PROTO_GAP_QUERY_STOP);
- if (GNUNET_OK != GNUNET_client_connection_write (ctx->sock,
- &req->header))
- GNUNET_client_connection_close_temporarily (ctx->sock);
- GNUNET_free(pos);
+ if (GNUNET_OK != GNUNET_client_connection_write (ctx->sock,
+ &req->header))
+ GNUNET_client_connection_close_temporarily (ctx->sock);
+ GNUNET_free (pos);
}
GNUNET_mutex_unlock (ctx->lock);
return GNUNET_SYSERR;
Modified: GNUnet/src/applications/fs/tools/gnunet-auto-share.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-auto-share.c 2008-06-12
05:49:44 UTC (rev 7147)
+++ GNUnet/src/applications/fs/tools/gnunet-auto-share.c 2008-06-12
06:01:44 UTC (rev 7148)
@@ -43,11 +43,11 @@
struct DirectoryRecord
{
- struct DirectoryRecord * next;
+ struct DirectoryRecord *next;
struct FileRecord *records;
- char * dirname;
+ char *dirname;
int records_changed;
@@ -177,19 +177,18 @@
};
static char *
-get_record_file_name(const char * dirname)
+get_record_file_name (const char *dirname)
{
GNUNET_EncName enc;
GNUNET_HashCode hc;
- GNUNET_hash(dirname, strlen(dirname), &hc);
- GNUNET_hash_to_enc(&hc, &enc);
- return GNUNET_get_home_filename(ectx,
- cfg,
- GNUNET_NO,
- "auto-share-info",
- (const char*)&enc,
- NULL);
+ GNUNET_hash (dirname, strlen (dirname), &hc);
+ GNUNET_hash_to_enc (&hc, &enc);
+ return GNUNET_get_home_filename (ectx,
+ cfg,
+ GNUNET_NO,
+ "auto-share-info",
+ (const char *) &enc, NULL);
}
/**
@@ -199,38 +198,39 @@
* of bytes that would be written)
*/
static unsigned int
-write_file_record(char * buf,
- unsigned int max,
- const struct FileRecord * rec)
+write_file_record (char *buf, unsigned int max, const struct FileRecord *rec)
{
- unsigned int wi;
+ unsigned int wi;
unsigned long long wl;
-
- if ( (buf != NULL) &&
- (max < sizeof(unsigned long long) * 3 + sizeof(GNUNET_HashCode) +
strlen(rec->filename) + sizeof(unsigned int)) )
+
+ if ((buf != NULL) &&
+ (max <
+ sizeof (unsigned long long) * 3 + sizeof (GNUNET_HashCode) +
+ strlen (rec->filename) + sizeof (unsigned int)))
{
- GNUNET_GE_BREAK(NULL, 0);
+ GNUNET_GE_BREAK (NULL, 0);
return 0;
}
if (buf != NULL)
{
- wi = htonl(strlen(rec->filename));
- memcpy(buf, &wi, sizeof(unsigned int));
- buf += sizeof(unsigned int);
- memcpy(buf, &rec->hc, sizeof(GNUNET_HashCode));
- buf += sizeof(GNUNET_HashCode);
- wl = GNUNET_htonll(rec->mtime);
- memcpy(buf, &wl, sizeof(unsigned long long));
- buf += sizeof(unsigned long long);
- wl = GNUNET_htonll(rec->last_seen);
- memcpy(buf, &wl, sizeof(unsigned long long));
- buf += sizeof(unsigned long long);
- wl = GNUNET_htonll(rec->size);
- memcpy(buf, &wl, sizeof(unsigned long long));
- buf += sizeof(unsigned long long);
- memcpy(buf, rec->filename, strlen(rec->filename));
+ wi = htonl (strlen (rec->filename));
+ memcpy (buf, &wi, sizeof (unsigned int));
+ buf += sizeof (unsigned int);
+ memcpy (buf, &rec->hc, sizeof (GNUNET_HashCode));
+ buf += sizeof (GNUNET_HashCode);
+ wl = GNUNET_htonll (rec->mtime);
+ memcpy (buf, &wl, sizeof (unsigned long long));
+ buf += sizeof (unsigned long long);
+ wl = GNUNET_htonll (rec->last_seen);
+ memcpy (buf, &wl, sizeof (unsigned long long));
+ buf += sizeof (unsigned long long);
+ wl = GNUNET_htonll (rec->size);
+ memcpy (buf, &wl, sizeof (unsigned long long));
+ buf += sizeof (unsigned long long);
+ memcpy (buf, rec->filename, strlen (rec->filename));
}
- return sizeof(unsigned long long) * 3 + sizeof(GNUNET_HashCode) +
strlen(rec->filename) + sizeof(unsigned int);
+ return sizeof (unsigned long long) * 3 + sizeof (GNUNET_HashCode) +
+ strlen (rec->filename) + sizeof (unsigned int);
}
/**
@@ -241,168 +241,159 @@
* @return 0 on error, otherwise number of bytes read
*/
static unsigned int
-read_file_record(const char * buf,
- unsigned int size,
- struct FileRecord ** head)
+read_file_record (const char *buf,
+ unsigned int size, struct FileRecord **head)
{
- unsigned int wi;
+ unsigned int wi;
unsigned long long wl;
- struct FileRecord * r;
+ struct FileRecord *r;
- if (size < sizeof(unsigned int))
+ if (size < sizeof (unsigned int))
{
- GNUNET_GE_BREAK(NULL, 0);
+ GNUNET_GE_BREAK (NULL, 0);
return 0;
}
- memcpy(&wi, buf, sizeof(unsigned int));
- if (size < ntohl(wi) + sizeof(unsigned long long) * 3 +
sizeof(GNUNET_HashCode) + sizeof(unsigned int))
+ memcpy (&wi, buf, sizeof (unsigned int));
+ if (size <
+ ntohl (wi) + sizeof (unsigned long long) * 3 +
+ sizeof (GNUNET_HashCode) + sizeof (unsigned int))
{
- GNUNET_GE_BREAK(NULL, 0);
+ GNUNET_GE_BREAK (NULL, 0);
return 0;
}
- buf += sizeof(unsigned int);
- r = GNUNET_malloc(sizeof(struct FileRecord));
+ buf += sizeof (unsigned int);
+ r = GNUNET_malloc (sizeof (struct FileRecord));
r->next = *head;
- memcpy(&r->hc, buf, sizeof(GNUNET_HashCode));
- buf += sizeof(GNUNET_HashCode);
- memcpy(&wl, buf, sizeof(unsigned long long));
- r->mtime = (time_t) GNUNET_ntohll(wl);
- buf += sizeof(unsigned long long);
- memcpy(&wl, buf, sizeof(unsigned long long));
- r->last_seen = (time_t) GNUNET_ntohll(wl);
- buf += sizeof(unsigned long long);
- memcpy(&wl, buf, sizeof(unsigned long long));
- r->size = (off_t) GNUNET_ntohll(wl);
- buf += sizeof(unsigned long long);
- r->filename = GNUNET_malloc(ntohl(wi) + 1);
- r->filename[ntohl(wi)] = '\0';
- memcpy(r->filename,
- buf,
- ntohl(wi));
+ memcpy (&r->hc, buf, sizeof (GNUNET_HashCode));
+ buf += sizeof (GNUNET_HashCode);
+ memcpy (&wl, buf, sizeof (unsigned long long));
+ r->mtime = (time_t) GNUNET_ntohll (wl);
+ buf += sizeof (unsigned long long);
+ memcpy (&wl, buf, sizeof (unsigned long long));
+ r->last_seen = (time_t) GNUNET_ntohll (wl);
+ buf += sizeof (unsigned long long);
+ memcpy (&wl, buf, sizeof (unsigned long long));
+ r->size = (off_t) GNUNET_ntohll (wl);
+ buf += sizeof (unsigned long long);
+ r->filename = GNUNET_malloc (ntohl (wi) + 1);
+ r->filename[ntohl (wi)] = '\0';
+ memcpy (r->filename, buf, ntohl (wi));
*head = r;
- return ntohl(wi) + sizeof(unsigned long long) * 3 + sizeof(GNUNET_HashCode)
+ sizeof(unsigned int);
+ return ntohl (wi) + sizeof (unsigned long long) * 3 +
+ sizeof (GNUNET_HashCode) + sizeof (unsigned int);
}
static struct FileRecord *
-read_all_records(const char * dir_name)
+read_all_records (const char *dir_name)
{
long off;
unsigned int d;
unsigned long long size;
- char * record_fn;
+ char *record_fn;
int fd;
- char * buf;
- struct FileRecord * ret;
+ char *buf;
+ struct FileRecord *ret;
- record_fn = get_record_file_name(dir_name);
- if ( (GNUNET_OK !=
- GNUNET_disk_file_size(ectx,
- record_fn,
- &size,
- GNUNET_YES)) ||
- (-1 == (fd = GNUNET_disk_file_open(ectx,
- record_fn,
- O_RDONLY)) ) )
+ record_fn = get_record_file_name (dir_name);
+ if ((GNUNET_OK !=
+ GNUNET_disk_file_size (ectx,
+ record_fn,
+ &size,
+ GNUNET_YES)) ||
+ (-1 == (fd = GNUNET_disk_file_open (ectx, record_fn, O_RDONLY))))
{
- GNUNET_free(record_fn);
+ GNUNET_free (record_fn);
return NULL;
}
- buf = MMAP(NULL, size, PROT_READ, MAP_SHARED, fd, 0);
+ buf = MMAP (NULL, size, PROT_READ, MAP_SHARED, fd, 0);
if (buf == MAP_FAILED)
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_ADMIN | GNUNET_GE_USER |
- GNUNET_GE_ERROR | GNUNET_GE_BULK,
- "mmap",
- record_fn);
- GNUNET_free(record_fn);
- CLOSE(fd);
+ GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_ERROR | GNUNET_GE_BULK,
+ "mmap", record_fn);
+ GNUNET_free (record_fn);
+ CLOSE (fd);
return NULL;
}
ret = NULL;
off = 0;
while (off < size)
{
- d = read_file_record(&buf[off],
- size - off,
- &ret);
+ d = read_file_record (&buf[off], size - off, &ret);
if (d == 0)
- {
- GNUNET_GE_BREAK(NULL, 0);
- break;
- }
+ {
+ GNUNET_GE_BREAK (NULL, 0);
+ break;
+ }
off += d;
}
- MUNMAP(buf, size);
- CLOSE(fd);
+ MUNMAP (buf, size);
+ CLOSE (fd);
return ret;
}
-static void
-write_all_records(struct DirectoryRecord * dr)
+static void
+write_all_records (struct DirectoryRecord *dr)
{
const char dummy;
long off;
unsigned int d;
unsigned long long size;
- char * record_fn;
+ char *record_fn;
int fd;
- char * buf;
- struct FileRecord * pos;
+ char *buf;
+ struct FileRecord *pos;
size = 0;
pos = dr->records;
while (pos != NULL)
{
- size += write_file_record(NULL, 0, pos);
+ size += write_file_record (NULL, 0, pos);
pos = pos->next;
}
- record_fn = get_record_file_name(dr->dirname);
- if ( (-1 == (fd = GNUNET_disk_file_open(ectx,
- record_fn,
- O_RDWR | O_CREAT | O_TRUNC,
- S_IRUSR | S_IWUSR)) ) )
+ record_fn = get_record_file_name (dr->dirname);
+ if ((-1 == (fd = GNUNET_disk_file_open (ectx,
+ record_fn,
+ O_RDWR | O_CREAT | O_TRUNC,
+ S_IRUSR | S_IWUSR))))
{
- GNUNET_free(record_fn);
+ GNUNET_free (record_fn);
return;
}
- LSEEK(fd, size - 1, SEEK_SET);
- WRITE(fd, &dummy, 1);
- buf = MMAP(NULL, size, PROT_WRITE, MAP_SHARED, fd, 0);
+ LSEEK (fd, size - 1, SEEK_SET);
+ WRITE (fd, &dummy, 1);
+ buf = MMAP (NULL, size, PROT_WRITE, MAP_SHARED, fd, 0);
if (buf == MAP_FAILED)
{
GNUNET_GE_LOG_STRERROR_FILE (ectx,
- GNUNET_GE_ADMIN | GNUNET_GE_USER |
- GNUNET_GE_ERROR | GNUNET_GE_BULK,
- "mmap",
- record_fn);
- CLOSE(fd);
- UNLINK(record_fn);
- GNUNET_free(record_fn);
+ GNUNET_GE_ADMIN | GNUNET_GE_USER |
+ GNUNET_GE_ERROR | GNUNET_GE_BULK,
+ "mmap", record_fn);
+ CLOSE (fd);
+ UNLINK (record_fn);
+ GNUNET_free (record_fn);
return;
}
off = 0;
pos = dr->records;
while (pos != NULL)
{
- d = write_file_record(&buf[off],
- size - off,
- pos);
+ d = write_file_record (&buf[off], size - off, pos);
if (d == 0)
- {
- GNUNET_GE_BREAK(NULL, 0);
- break;
- }
+ {
+ GNUNET_GE_BREAK (NULL, 0);
+ break;
+ }
pos = pos->next;
off += d;
}
- MUNMAP(buf, size);
- CLOSE(fd);
+ MUNMAP (buf, size);
+ CLOSE (fd);
}
static struct FileRecord *
-find_entry (struct DirectoryRecord * dr,
- const char *filename)
+find_entry (struct DirectoryRecord *dr, const char *filename)
{
struct FileRecord *pos = dr->records;
while ((pos != NULL) && (0 != strcmp (filename, pos->filename)))
@@ -411,11 +402,9 @@
}
static int
-test_run (const char *filename,
- const char *dirName,
- void *cls)
+test_run (const char *filename, const char *dirName, void *cls)
{
- struct DirectoryRecord * dr = cls;
+ struct DirectoryRecord *dr = cls;
GNUNET_HashCode hc;
struct FileRecord *rec;
struct stat buf;
@@ -441,7 +430,7 @@
{
rec = GNUNET_malloc (sizeof (struct FileRecord));
rec->next = dr->records;
- rec->filename = GNUNET_strdup(fn);
+ rec->filename = GNUNET_strdup (fn);
rec->mtime = buf.st_mtime;
rec->size = buf.st_size;
rec->last_seen = time (NULL);
@@ -452,8 +441,8 @@
if (GNUNET_NO == GNUNET_FS_test_indexed (sock, &rec->hc))
{
dr->run = 1;
- GNUNET_free (fn);
- /* keep iterating to mark all other files in this tree! */
+ GNUNET_free (fn);
+ /* keep iterating to mark all other files in this tree! */
return GNUNET_OK;
}
}
@@ -487,21 +476,20 @@
add_meta_data (void *cls,
struct GNUNET_GC_Configuration *cfg,
struct GNUNET_GE_Context *ectx,
- const char *section,
- const char *option)
+ const char *section, const char *option)
{
struct AddMetadataClosure *amc = cls;
EXTRACTOR_KeywordType type;
EXTRACTOR_KeywordType max;
char *value;
- if ( (0 != strcmp (amc->filename, section)) &&
- ( (0 != strncmp (amc->filename,
- section,
- strlen(amc->filename))) ||
- (strlen(section) != strlen(amc->filename) + 1) ||
- ( (section[strlen(section)-1] != '/') &&
- (section[strlen(section)-1] != '\\') ) ) )
+ if ((0 != strcmp (amc->filename, section)) &&
+ ((0 != strncmp (amc->filename,
+ section,
+ strlen (amc->filename))) ||
+ (strlen (section) != strlen (amc->filename) + 1) ||
+ ((section[strlen (section) - 1] != '/') &&
+ (section[strlen (section) - 1] != '\\'))))
return 0;
max = EXTRACTOR_getHighestKeywordTypeNumber ();
for (type = 0; type < max; type++)
@@ -530,19 +518,17 @@
}
static int
-probe_directory (const char *filename,
- const char *dirName,
- void *cls)
+probe_directory (const char *filename, const char *dirName, void *cls)
{
- struct DirectoryRecord * dr = cls;
+ struct DirectoryRecord *dr = cls;
struct stat buf;
struct AddMetadataClosure amc;
struct GNUNET_ECRS_URI *kuri;
char *fn;
char *keys;
- if (GNUNET_shutdown_test())
- return GNUNET_SYSERR; /* aborted */
+ if (GNUNET_shutdown_test ())
+ return GNUNET_SYSERR; /* aborted */
if (filename[0] == '.')
return GNUNET_OK;
if (ul != NULL)
@@ -601,8 +587,7 @@
* @return return 0 for ok, -1 on error
*/
int
-auto_share_main (int argc,
- char * const * argv)
+auto_share_main (int argc, char *const *argv)
{
int errorCode;
int work_done;
@@ -611,8 +596,8 @@
char *metafn;
struct FileRecord *rpos;
int filedes[2]; /* pipe between client and parent */
- struct DirectoryRecord * head;
- struct DirectoryRecord * pos;
+ struct DirectoryRecord *head;
+ struct DirectoryRecord *pos;
errorCode = 0;
if ((GNUNET_NO == debug_flag)
@@ -628,7 +613,7 @@
GNUNET_terminal_detach_complete (ectx, filedes, GNUNET_NO);
goto quit;
}
-
+
GNUNET_GC_get_configuration_value_number (cfg,
"GNUNET",
"VERBOSE", 0, 9999, 0, &verbose);
@@ -650,9 +635,9 @@
head = NULL;
while (argc > 0)
{
- pos = GNUNET_malloc(sizeof(struct DirectoryRecord));
+ pos = GNUNET_malloc (sizeof (struct DirectoryRecord));
pos->dirname = GNUNET_expand_file_name (ectx, argv[--argc]);
- pos->records = read_all_records(pos->dirname);
+ pos->records = read_all_records (pos->dirname);
pos->records_changed = GNUNET_NO;
pos->run = 0;
pos->next = head;
@@ -665,33 +650,32 @@
work_done = GNUNET_NO;
GNUNET_thread_sleep (250 * GNUNET_CRON_MILLISECONDS);
pos = head;
- while ( (pos != NULL) &&
- (GNUNET_NO == GNUNET_shutdown_test () ) )
- {
- GNUNET_disk_directory_scan (ectx, pos->dirname, &probe_directory,
pos);
- if (GNUNET_YES == upload_done)
- {
- work_done = GNUNET_YES;
- GNUNET_FSUI_upload_abort (ul);
- GNUNET_FSUI_upload_stop (ul);
- upload_done = GNUNET_NO;
- ul = NULL;
- }
- pos = pos->next;
- }
- if ( (ul == NULL) &&
- (work_done == GNUNET_NO) &&
- (GNUNET_NO == GNUNET_shutdown_test ()))
- {
- GNUNET_thread_sleep (delay);
- delay *= 2;
- if (delay > GNUNET_CRON_HOURS)
- delay = GNUNET_CRON_HOURS;
- }
+ while ((pos != NULL) && (GNUNET_NO == GNUNET_shutdown_test ()))
+ {
+ GNUNET_disk_directory_scan (ectx, pos->dirname, &probe_directory,
+ pos);
+ if (GNUNET_YES == upload_done)
+ {
+ work_done = GNUNET_YES;
+ GNUNET_FSUI_upload_abort (ul);
+ GNUNET_FSUI_upload_stop (ul);
+ upload_done = GNUNET_NO;
+ ul = NULL;
+ }
+ pos = pos->next;
+ }
+ if ((ul == NULL) &&
+ (work_done == GNUNET_NO) && (GNUNET_NO == GNUNET_shutdown_test ()))
+ {
+ GNUNET_thread_sleep (delay);
+ delay *= 2;
+ if (delay > GNUNET_CRON_HOURS)
+ delay = GNUNET_CRON_HOURS;
+ }
else
- {
- delay = 5 * GNUNET_CRON_SECONDS;
- }
+ {
+ delay = 5 * GNUNET_CRON_SECONDS;
+ }
}
GNUNET_FSUI_stop (ctx);
if (gloKeywords != NULL)
@@ -700,19 +684,19 @@
while (head != NULL)
{
if (head->records_changed)
- write_all_records(head);
+ write_all_records (head);
while (head->records != NULL)
- {
- rpos = head->records;
- head->records = rpos->next;
- GNUNET_free (rpos->filename);
- GNUNET_free (rpos);
- }
+ {
+ rpos = head->records;
+ head->records = rpos->next;
+ GNUNET_free (rpos->filename);
+ GNUNET_free (rpos);
+ }
pos = head->next;
GNUNET_free (head->dirname);
GNUNET_free (head);
head = pos;
- }
+ }
if (meta_cfg != NULL)
GNUNET_GC_free (meta_cfg);
@@ -837,8 +821,7 @@
if (i > argc - 1)
{
fprintf (stderr,
- _
- ("You must specify at least one directory for sharing.\n"));
+ _("You must specify at least one directory for sharing.\n"));
errorCode = -1;
goto end;
}
@@ -853,7 +836,7 @@
myout = fopen (log_file_name, "a");
if (myout == NULL)
{
- fprintf (stderr,
+ fprintf (stderr,
"Could not open logfile `%s': %s\n",
log_file_name, strerror (errno));
GNUNET_free (log_file_name);
@@ -891,7 +874,7 @@
else
#endif
{
- errorCode = auto_share_main (argc-i, &argv[i]);
+ errorCode = auto_share_main (argc - i, &argv[i]);
}
end:
GNUNET_fini (ectx, cfg);
Modified: GNUnet/src/applications/fs/tools/gnunet-unindex.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-unindex.c 2008-06-12 05:49:44 UTC
(rev 7147)
+++ GNUnet/src/applications/fs/tools/gnunet-unindex.c 2008-06-12 06:01:44 UTC
(rev 7148)
@@ -75,9 +75,9 @@
event->data.UnindexCompleted.total,
delta / GNUNET_CRON_SECONDS,
(delta ==
- 0) ? (double) (-1.0) : (double) (event->data.
- UnindexCompleted.total /
- 1024.0 *
+ 0) ? (double) (-1.0) : (double) (event->
+ data.UnindexCompleted.
+ total / 1024.0 *
GNUNET_CRON_SECONDS /
delta));
}
Modified: GNUnet/src/applications/fs/uritrack/file_info.c
===================================================================
--- GNUnet/src/applications/fs/uritrack/file_info.c 2008-06-12 05:49:44 UTC
(rev 7147)
+++ GNUnet/src/applications/fs/uritrack/file_info.c 2008-06-12 06:01:44 UTC
(rev 7148)
@@ -45,7 +45,9 @@
char *ipcName;
struct GNUNET_IPC_Semaphore *sem;
- ipcName = GNUNET_get_home_filename(ectx, cfg, GNUNET_NO,
"uritrack_ipc_lock", NULL);
+ ipcName =
+ GNUNET_get_home_filename (ectx, cfg, GNUNET_NO, "uritrack_ipc_lock",
+ NULL);
sem = GNUNET_IPC_semaphore_create (ectx, ipcName, 1);
GNUNET_free (ipcName);
return sem;
@@ -55,20 +57,14 @@
getUriDbName (struct GNUNET_GE_Context *ectx,
struct GNUNET_GC_Configuration *cfg)
{
- return GNUNET_get_home_filename(ectx, cfg,
- GNUNET_NO,
- STATE_NAME,
- NULL);
+ return GNUNET_get_home_filename (ectx, cfg, GNUNET_NO, STATE_NAME, NULL);
}
static char *
getToggleName (struct GNUNET_GE_Context *ectx,
struct GNUNET_GC_Configuration *cfg)
{
- return GNUNET_get_home_filename(ectx, cfg,
- GNUNET_NO,
- TRACK_OPTION,
- NULL);
+ return GNUNET_get_home_filename (ectx, cfg, GNUNET_NO, TRACK_OPTION, NULL);
}
/**
Modified: GNUnet/src/applications/fs/uritrack/uri_info.c
===================================================================
--- GNUnet/src/applications/fs/uritrack/uri_info.c 2008-06-12 05:49:44 UTC
(rev 7147)
+++ GNUnet/src/applications/fs/uritrack/uri_info.c 2008-06-12 06:01:44 UTC
(rev 7148)
@@ -36,11 +36,7 @@
static char *
getDBName (struct GNUNET_GC_Configuration *cfg)
{
- return GNUNET_get_home_filename(NULL,
- cfg,
- GNUNET_NO,
- "uri_info.db",
- NULL);
+ return GNUNET_get_home_filename (NULL, cfg, GNUNET_NO, "uri_info.db", NULL);
}
static unsigned long long
Modified: GNUnet/src/applications/sqstore_mysql/mysql.c
===================================================================
--- GNUnet/src/applications/sqstore_mysql/mysql.c 2008-06-12 05:49:44 UTC
(rev 7147)
+++ GNUnet/src/applications/sqstore_mysql/mysql.c 2008-06-12 06:01:44 UTC
(rev 7148)
@@ -1273,8 +1273,8 @@
if (type != 0)
stmt =
(vhash !=
- NULL) ? dbh->count_entry_by_hash_vhash_and_type : dbh->
- count_entry_by_hash_and_type;
+ NULL) ? dbh->
+ count_entry_by_hash_vhash_and_type : dbh->count_entry_by_hash_and_type;
else
stmt =
(vhash !=
@@ -1416,8 +1416,8 @@
else
stmt =
(vhash !=
- NULL) ? dbh->select_entry_by_hash_and_vhash : dbh->
- select_entry_by_hash;
+ NULL) ? dbh->
+ select_entry_by_hash_and_vhash : dbh->select_entry_by_hash;
if (count == 0)
limit_off = off;
else
Modified: GNUnet/src/applications/testing/remote.c
===================================================================
--- GNUnet/src/applications/testing/remote.c 2008-06-12 05:49:44 UTC (rev
7147)
+++ GNUnet/src/applications/testing/remote.c 2008-06-12 06:01:44 UTC (rev
7148)
@@ -421,8 +421,7 @@
GNUNET_REMOTE_start_daemon (remote_gnunetd_path, "/tmp/",
temp, remote_config_path,
curr_host, ssh_username,
- temp_pos->
- remote_friend_file_path);
+
temp_pos->remote_friend_file_path);
GNUNET_GC_get_configuration_value_number (basecfg,
"NETWORK",
Modified: GNUnet/src/applications/testing/remotetopologies.c
===================================================================
--- GNUnet/src/applications/testing/remotetopologies.c 2008-06-12 05:49:44 UTC
(rev 7147)
+++ GNUnet/src/applications/testing/remotetopologies.c 2008-06-12 06:01:44 UTC
(rev 7148)
@@ -370,15 +370,13 @@
{
fprintf (stderr, ".");
if (GNUNET_YES == GNUNET_IDENTITY_request_connect (sock1,
- &h2->
-
senderIdentity))
+
&h2->senderIdentity))
{
ret = GNUNET_OK;
break;
}
if (GNUNET_YES == GNUNET_IDENTITY_request_connect (sock2,
- &h1->
-
senderIdentity))
+
&h1->senderIdentity))
{
ret = GNUNET_OK;
break;
Modified: GNUnet/src/applications/testing/testing.c
===================================================================
--- GNUnet/src/applications/testing/testing.c 2008-06-12 05:49:44 UTC (rev
7147)
+++ GNUnet/src/applications/testing/testing.c 2008-06-12 06:01:44 UTC (rev
7148)
@@ -277,8 +277,7 @@
{
fprintf (stderr, ".");
if (GNUNET_YES == GNUNET_IDENTITY_request_connect (sock1,
- &h2->
-
senderIdentity))
+
&h2->senderIdentity))
{
ret = GNUNET_OK;
GNUNET_free_non_null (h1);
@@ -286,8 +285,7 @@
break;
}
if (GNUNET_YES == GNUNET_IDENTITY_request_connect (sock2,
- &h1->
-
senderIdentity))
+
&h1->senderIdentity))
{
ret = GNUNET_OK;
GNUNET_free_non_null (h1);
Modified: GNUnet/src/include/gnunet_ecrs_lib.h
===================================================================
--- GNUnet/src/include/gnunet_ecrs_lib.h 2008-06-12 05:49:44 UTC (rev
7147)
+++ GNUnet/src/include/gnunet_ecrs_lib.h 2008-06-12 06:01:44 UTC (rev
7148)
@@ -607,7 +607,9 @@
struct
GNUNET_GC_Configuration
*cfg,
- struct
GNUNET_FS_SearchContext * sc,
+ struct
+
GNUNET_FS_SearchContext
+ *sc,
const struct
GNUNET_ECRS_URI
*uri,
@@ -693,7 +695,8 @@
*GNUNET_ECRS_file_download_partial_start (struct GNUNET_GE_Context *ectx,
struct GNUNET_GC_Configuration
*cfg,
- struct GNUNET_FS_SearchContext * sc,
+ struct GNUNET_FS_SearchContext
+ *sc,
const struct GNUNET_ECRS_URI *uri,
const char *filename,
unsigned long long offset,
Modified: GNUnet/src/include/gnunet_fs_lib.h
===================================================================
--- GNUnet/src/include/gnunet_fs_lib.h 2008-06-12 05:49:44 UTC (rev 7147)
+++ GNUnet/src/include/gnunet_fs_lib.h 2008-06-12 06:01:44 UTC (rev 7148)
@@ -91,10 +91,9 @@
*/
int
GNUNET_FS_stop_search (struct
- GNUNET_FS_SearchContext
- *ctx,
- GNUNET_DatastoreValueIterator
- callback, void *closure);
+ GNUNET_FS_SearchContext
+ *ctx,
+ GNUNET_DatastoreValueIterator callback, void *closure);
/**
* Insert a block. Note that while the API is VERY similar to
Modified: GNUnet/src/include/gnunet_util_disk.h
===================================================================
--- GNUnet/src/include/gnunet_util_disk.h 2008-06-12 05:49:44 UTC (rev
7147)
+++ GNUnet/src/include/gnunet_util_disk.h 2008-06-12 06:01:44 UTC (rev
7148)
@@ -204,11 +204,9 @@
* private directory name.
* @return the constructed filename
*/
-char *
-GNUNET_get_home_filename (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- int is_daemon,
- ...);
+char *GNUNET_get_home_filename (struct GNUNET_GE_Context *ectx,
+ struct GNUNET_GC_Configuration *cfg,
+ int is_daemon, ...);
#if 0 /* keep Emacsens' auto-indent happy */
{
Modified: GNUnet/src/server/connection.c
===================================================================
--- GNUnet/src/server/connection.c 2008-06-12 05:49:44 UTC (rev 7147)
+++ GNUnet/src/server/connection.c 2008-06-12 06:01:44 UTC (rev 7148)
@@ -721,8 +721,8 @@
if (root->session.tsession != NULL)
GNUNET_GE_ASSERT (NULL,
GNUNET_OK ==
- transport->assert_associated (root->session.
- tsession,
+ transport->assert_associated (root->
+ session.tsession,
__FILE__));
root = root->overflowChain;
}
@@ -1903,8 +1903,8 @@
stats->change (stat_transmitted, p);
be->available_send_window -= p;
be->lastSequenceNumberSend++;
- GNUNET_CORE_connection_reserve_downstream_bandwidth (&be->session.
- sender, 0);
+ GNUNET_CORE_connection_reserve_downstream_bandwidth (&be->
+ session.sender, 0);
if (be->idealized_limit > be->max_transmitted_limit)
be->max_transmitted_limit = be->idealized_limit;
else /* age */
@@ -2484,8 +2484,8 @@
{
IF_GELOG (ectx,
GNUNET_GE_INFO | GNUNET_GE_BULK | GNUNET_GE_USER,
- GNUNET_hash_to_enc (&entries[u]->session.sender.
- hashPubKey, &enc));
+ GNUNET_hash_to_enc (&entries[u]->session.
+ sender.hashPubKey, &enc));
GNUNET_GE_LOG (ectx,
GNUNET_GE_INFO | GNUNET_GE_BULK | GNUNET_GE_USER,
"peer `%s' transmitted above limit: %llu bpm > %u
bpm\n",
@@ -2508,8 +2508,8 @@
#if DEBUG_CONNECTION
IF_GELOG (ectx,
GNUNET_GE_INFO | GNUNET_GE_BULK | GNUNET_GE_DEVELOPER,
- GNUNET_hash_to_enc (&entries[u]->session.sender.
- hashPubKey, &enc));
+ GNUNET_hash_to_enc (&entries[u]->session.
+ sender.hashPubKey, &enc));
GNUNET_GE_LOG (ectx,
GNUNET_GE_INFO | GNUNET_GE_BULK |
GNUNET_GE_DEVELOPER,
@@ -2570,8 +2570,8 @@
for (u = 0; u < activePeerCount; u++)
{
GNUNET_CORE_connection_reserve_downstream_bandwidth (&entries
- [u]->
- session.sender, 0);
+ [u]->session.
+ sender, 0);
entries[u]->idealized_limit = 0;
}
while ((schedulableBandwidth > activePeerCount * 100) &&
@@ -2905,8 +2905,8 @@
IF_GELOG (ectx,
GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_DEVELOPER,
- GNUNET_hash_to_enc (&root->session.sender.
- hashPubKey, &enc));
+ GNUNET_hash_to_enc (&root->session.
+ sender.hashPubKey, &enc));
GNUNET_GE_LOG (ectx,
GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_DEVELOPER,
@@ -3009,8 +3009,8 @@
IF_GELOG (ectx,
GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_DEVELOPER,
- GNUNET_hash_to_enc (&root->session.sender.
- hashPubKey, &enc));
+ GNUNET_hash_to_enc (&root->session.
+ sender.hashPubKey, &enc));
GNUNET_GE_LOG (ectx,
GNUNET_GE_DEBUG | GNUNET_GE_REQUEST |
GNUNET_GE_DEVELOPER,
Modified: GNUnet/src/server/version.c
===================================================================
--- GNUnet/src/server/version.c 2008-06-12 05:49:44 UTC (rev 7147)
+++ GNUnet/src/server/version.c 2008-06-12 06:01:44 UTC (rev 7148)
@@ -98,11 +98,7 @@
getVersionFileName (struct GNUNET_GE_Context *ectx,
struct GNUNET_GC_Configuration *cfg)
{
- return GNUNET_get_home_filename(ectx,
- cfg,
- GNUNET_YES,
- VERSIONFILE,
- NULL);
+ return GNUNET_get_home_filename (ectx, cfg, GNUNET_YES, VERSIONFILE, NULL);
}
#define MAX_VS sizeof(GNUNET_EncName) + 64
Modified: GNUnet/src/setup/lib/gns.c
===================================================================
--- GNUnet/src/setup/lib/gns.c 2008-06-12 05:49:44 UTC (rev 7147)
+++ GNUnet/src/setup/lib/gns.c 2008-06-12 06:01:44 UTC (rev 7148)
@@ -122,8 +122,8 @@
val = GNUNET_GC_get_configuration_value_yesno (cfg,
section,
option,
- pos->value.Boolean.
- def);
+ pos->value.
+ Boolean.def);
if (val == GNUNET_SYSERR)
{
return GNUNET_SYSERR;
@@ -138,18 +138,9 @@
if (GNUNET_SYSERR == GNUNET_GC_get_configuration_value_number (cfg,
section,
option,
- pos->
- value.
- UInt64.
- min,
- pos->
- value.
- UInt64.
- max,
- pos->
- value.
- UInt64.
- def,
+
pos->value.UInt64.min,
+
pos->value.UInt64.max,
+
pos->value.UInt64.def,
&val))
{
return GNUNET_SYSERR;
@@ -194,10 +185,7 @@
if (GNUNET_SYSERR == GNUNET_GC_get_configuration_value_string (cfg,
section,
option,
- pos->
- value.
- String.
- def,
+
pos->value.String.def,
&val))
return GNUNET_SYSERR;
GNUNET_free (pos->value.String.val);
@@ -214,14 +202,8 @@
(const
char
**)
- pos->
- value.
- String.
-
legalRange,
- pos->
- value.
- String.
- def,
+
pos->value.String.legalRange,
+
pos->value.String.def,
&ival))
return GNUNET_SYSERR;
GNUNET_free (pos->value.String.val);
Modified: GNUnet/src/setup/ncurses/mconf.c
===================================================================
--- GNUnet/src/setup/ncurses/mconf.c 2008-06-12 05:49:44 UTC (rev 7147)
+++ GNUnet/src/setup/ncurses/mconf.c 2008-06-12 06:01:44 UTC (rev 7148)
@@ -179,10 +179,8 @@
case DLG_EXIT_CANCEL:
if (0 != GNUNET_GC_set_configuration_value_string (cfg,
ectx,
- pos->
- section,
- pos->
- option,
+
pos->section,
+
pos->option,
st ==
DLG_EXIT_OK
? "YES" :
@@ -217,12 +215,9 @@
case DLG_EXIT_OK:
if (0 != GNUNET_GC_set_configuration_value_string (cfg,
ectx,
- pos->
- section,
- pos->
- option,
- fitem.
- text))
+
pos->section,
+
pos->option,
+
fitem.text))
{
show_help (pos->option,
gettext_noop
@@ -284,13 +279,9 @@
case DLG_EXIT_OK:
if (0 != GNUNET_GC_set_configuration_value_choice (cfg,
ectx,
- pos->
- section,
- pos->
- option,
- val->
- String.
- legalRange
+
pos->section,
+
pos->option,
+
val->String.legalRange
[msel]))
{
show_help (pos->option,
@@ -369,10 +360,8 @@
tmp[strlen (tmp) - 1] = '\0';
if (0 != GNUNET_GC_set_configuration_value_choice (cfg,
ectx,
- pos->
- section,
- pos->
- option,
+
pos->section,
+
pos->option,
tmp))
{
GNUNET_free (tmp);
@@ -416,12 +405,9 @@
}
if (0 != GNUNET_GC_set_configuration_value_string (cfg,
ectx,
- pos->
- section,
- pos->
- option,
- fitem.
- text))
+
pos->section,
+
pos->option,
+
fitem.text))
{
show_help (pos->option,
gettext_noop
@@ -470,10 +456,8 @@
}
if (0 != GNUNET_GC_set_configuration_value_number (cfg,
ectx,
- pos->
-
section,
- pos->
-
option,
+
pos->section,
+
pos->option,
lval))
{
show_help (pos->option,
Modified: GNUnet/src/transports/http.c
===================================================================
--- GNUnet/src/transports/http.c 2008-06-12 05:49:44 UTC (rev 7147)
+++ GNUnet/src/transports/http.c 2008-06-12 06:01:44 UTC (rev 7148)
@@ -1006,8 +1006,9 @@
cpy = sizeof (GNUNET_MessageHeader) - httpSession->cs.client.rpos1;
if (cpy > have)
cpy = have;
- memcpy (&httpSession->cs.client.
- rbuff1[httpSession->cs.client.rpos1], &inbuf[poff], cpy);
+ memcpy (&httpSession->cs.
+ client.rbuff1[httpSession->cs.client.rpos1], &inbuf[poff],
+ cpy);
httpSession->cs.client.rpos1 += cpy;
have -= cpy;
poff += cpy;
@@ -1027,8 +1028,9 @@
httpSession->cs.client.rpos2;
if (cpy > have)
cpy = have;
- memcpy (&httpSession->cs.client.
- rbuff2[httpSession->cs.client.rpos2], &inbuf[poff], cpy);
+ memcpy (&httpSession->cs.
+ client.rbuff2[httpSession->cs.client.rpos2], &inbuf[poff],
+ cpy);
have -= cpy;
poff += cpy;
httpSession->cs.client.rpos2 += cpy;
Modified: GNUnet/src/util/crypto/hashing.c
===================================================================
--- GNUnet/src/util/crypto/hashing.c 2008-06-12 05:49:44 UTC (rev 7147)
+++ GNUnet/src/util/crypto/hashing.c 2008-06-12 06:01:44 UTC (rev 7148)
@@ -426,12 +426,12 @@
}
if (GNUNET_YES == GNUNET_shutdown_test ())
{
- if (0 != CLOSE (fh))
+ if (0 != CLOSE (fh))
GNUNET_GE_LOG_STRERROR_FILE (ectx,
GNUNET_GE_ERROR | GNUNET_GE_USER |
GNUNET_GE_ADMIN | GNUNET_GE_BULK,
"close", filename);
- GNUNET_free (buf);
+ GNUNET_free (buf);
return GNUNET_SYSERR;
}
sha512_update (&ctx, buf, delta);
Modified: GNUnet/src/util/disk/filenames.c
===================================================================
--- GNUnet/src/util/disk/filenames.c 2008-06-12 05:49:44 UTC (rev 7147)
+++ GNUnet/src/util/disk/filenames.c 2008-06-12 06:01:44 UTC (rev 7148)
@@ -70,9 +70,8 @@
*/
char *
GNUNET_get_home_filename (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg,
- int is_daemon,
- ...)
+ struct GNUNET_GC_Configuration *cfg,
+ int is_daemon, ...)
{
const char *c;
char *pfx;
@@ -81,49 +80,46 @@
unsigned int needed;
GNUNET_GC_get_configuration_value_filename (cfg,
- is_daemon
- ? "GNUNETD"
- : "GNUNET",
- is_daemon
- ? "GNUNETD_HOME"
- : "GNUNET_HOME",
- is_daemon
- ?
GNUNET_DEFAULT_DAEMON_VAR_DIRECTORY
- : GNUNET_DEFAULT_HOME_DIRECTORY,
+ is_daemon
+ ? "GNUNETD"
+ : "GNUNET",
+ is_daemon
+ ? "GNUNETD_HOME"
+ : "GNUNET_HOME",
+ is_daemon
+ ?
+
GNUNET_DEFAULT_DAEMON_VAR_DIRECTORY
+ : GNUNET_DEFAULT_HOME_DIRECTORY,
&pfx);
- needed = strlen(pfx) + 2;
- if ( (pfx[strlen(pfx)-1] != '/') &&
- (pfx[strlen(pfx)-1] != '\\') )
+ needed = strlen (pfx) + 2;
+ if ((pfx[strlen (pfx) - 1] != '/') && (pfx[strlen (pfx) - 1] != '\\'))
needed++;
va_start (ap, is_daemon);
while (1)
{
c = va_arg (ap, const char *);
if (c == NULL)
- break;
+ break;
needed += strlen (c);
- if ( (c[strlen(c)-1] != '/') &&
- (c[strlen(c)-1] != '\\') )
- needed++;
+ if ((c[strlen (c) - 1] != '/') && (c[strlen (c) - 1] != '\\'))
+ needed++;
}
va_end (ap);
ret = GNUNET_malloc (needed);
- strcpy(ret, pfx);
- GNUNET_free(pfx);
+ strcpy (ret, pfx);
+ GNUNET_free (pfx);
va_start (ap, is_daemon);
while (1)
{
c = va_arg (ap, const char *);
if (c == NULL)
- break;
- if ( (c[strlen(c)-1] != '/') &&
- (c[strlen(c)-1] != '\\') )
- strcat(ret, DIR_SEPARATOR_STR);
- strcat(ret, c);
+ break;
+ if ((c[strlen (c) - 1] != '/') && (c[strlen (c) - 1] != '\\'))
+ strcat (ret, DIR_SEPARATOR_STR);
+ strcat (ret, c);
}
va_end (ap);
- if ( (ret[strlen(ret)-1] != '/') &&
- (ret[strlen(ret)-1] != '\\') )
+ if ((ret[strlen (ret) - 1] != '/') && (ret[strlen (ret) - 1] != '\\'))
GNUNET_disk_directory_create_for_file (ectx, ret);
else
GNUNET_disk_directory_create (ectx, ret);
Modified: GNUnet/src/util/os/semaphore.c
===================================================================
--- GNUnet/src/util/os/semaphore.c 2008-06-12 05:49:44 UTC (rev 7147)
+++ GNUnet/src/util/os/semaphore.c 2008-06-12 06:01:44 UTC (rev 7148)
@@ -408,7 +408,7 @@
{
int cnt;
- GNUNET_mutex_lock(sem->internalLock);
+ GNUNET_mutex_lock (sem->internalLock);
FLOCK (sem->fd, LOCK_EX);
SEMA_LSEEK (sem->fd, 0, SEEK_SET);
if (sizeof (int) != READ (sem->fd, &cnt, sizeof (int)))
Modified: GNUnet/src/util/pseudonym/common.c
===================================================================
--- GNUnet/src/util/pseudonym/common.c 2008-06-12 05:49:44 UTC (rev 7147)
+++ GNUnet/src/util/pseudonym/common.c 2008-06-12 06:01:44 UTC (rev 7148)
@@ -42,13 +42,13 @@
GNUNET_EncName enc;
if (psid != NULL)
- GNUNET_hash_to_enc (psid, &enc);
- return GNUNET_get_home_filename(ectx,
- cfg,
- GNUNET_NO,
- prefix,
- (psid == NULL) ? NULL : (const char*)&enc,
- NULL);
+ GNUNET_hash_to_enc (psid, &enc);
+ return GNUNET_get_home_filename (ectx,
+ cfg,
+ GNUNET_NO,
+ prefix,
+ (psid ==
+ NULL) ? NULL : (const char *) &enc, NULL);
}
/* end of common.c */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r7148 - in GNUnet: libltdl po src/applications/datastore src/applications/fs/collection src/applications/fs/ecrs src/applications/fs/fsui src/applications/fs/gap src/applications/fs/lib src/applications/fs/tools src/applications/fs/uritrack src/applications/sqstore_mysql src/applications/testing src/include src/server src/setup/lib src/setup/ncurses src/transports src/util/crypto src/util/disk src/util/os src/util/pseudonym,
gnunet <=