[GNUnet-SVN] [gnunet] branch master updated (f553963d6 -> 9bb2b2522)

gnunet-svn
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] branch master updated (f553963d6 -> 9bb2b2522)

From:	gnunet
Subject:	[GNUnet-SVN] [gnunet] branch master updated (f553963d6 -> 9bb2b2522)
Date:	Mon, 20 Feb 2017 20:11:45 +0100
This is an automated email from the git hooks/post-receive script.

david-barksdale pushed a change to branch master
in repository gnunet.

    from f553963d6 ignore kdevelop files
     new fe4f6e8ce Restrict update to positive priority deltas
     new 9bb2b2522 Update po files

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 po/de.po                                  | 30 +++++++++++++++---------------
 po/es.po                                  | 30 +++++++++++++++---------------
 po/fr.po                                  | 30 +++++++++++++++---------------
 po/sv.po                                  | 30 +++++++++++++++---------------
 po/vi.po                                  | 30 +++++++++++++++---------------
 po/zh_CN.po                               | 30 +++++++++++++++---------------
 src/datastore/gnunet-service-datastore.c  |  2 +-
 src/datastore/plugin_datastore_heap.c     | 11 +++++------
 src/datastore/plugin_datastore_mysql.c    |  9 +++------
 src/datastore/plugin_datastore_postgres.c | 14 ++++++++------
 src/datastore/plugin_datastore_sqlite.c   | 12 ++++++++----
 src/datastore/plugin_datastore_template.c |  6 ++----
 src/include/gnunet_datastore_plugin.h     |  6 ++----
 13 files changed, 119 insertions(+), 121 deletions(-)

diff --git a/po/de.po b/po/de.po
index 7dd4e34fd..bcaabb164 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-02-20 11:12-0600\n"
+"POT-Creation-Date: 2017-02-20 12:08-0600\n"
 "PO-Revision-Date: 2015-03-08 16:16+0100\n"
 "Last-Translator: Mario Blättermann <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -1519,7 +1519,7 @@ msgstr ""
 
 #: src/datacache/plugin_datacache_sqlite.c:77
 #: src/datacache/plugin_datacache_sqlite.c:86
-#: src/datastore/plugin_datastore_mysql.c:1027
+#: src/datastore/plugin_datastore_mysql.c:1024
 #: src/datastore/plugin_datastore_sqlite.c:57
 #: src/datastore/plugin_datastore_sqlite.c:65 src/my/my.c:80 src/my/my.c:92
 #: src/mysql/mysql.c:42 src/mysql/mysql.c:49
@@ -1541,7 +1541,7 @@ msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "»%s« schlug bei %s:%d mit dem Fehler %s fehl\n"
 
 #: src/datacache/plugin_datacache_sqlite.c:749
-#: src/datastore/plugin_datastore_sqlite.c:409
+#: src/datastore/plugin_datastore_sqlite.c:415
 #: src/namecache/plugin_namecache_sqlite.c:292
 #: src/namestore/plugin_namestore_sqlite.c:343
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
@@ -1781,12 +1781,12 @@ msgstr "Datei wurde als `%s' gespeichert.\n"
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Bloomfilter konnte nicht initialisiert werden.\n"
 
-#: src/datastore/plugin_datastore_heap.c:824
+#: src/datastore/plugin_datastore_heap.c:823
 msgid "Heap database running\n"
 msgstr "Heap-Datenbank läuft\n"
 
 #: src/datastore/plugin_datastore_mysql.c:347
-#: src/datastore/plugin_datastore_sqlite.c:507
+#: src/datastore/plugin_datastore_sqlite.c:513
 #, fuzzy
 msgid "Data too large"
 msgstr "Anzahl der Werte"
@@ -1795,26 +1795,26 @@ msgstr "Anzahl der Werte"
 msgid "MySQL statement run failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:983
+#: src/datastore/plugin_datastore_mysql.c:980
 #, fuzzy, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr "`%s' an `%s' schlug fehl bei %s:%d mit dem Fehler: %s\n"
 
-#: src/datastore/plugin_datastore_mysql.c:1257
+#: src/datastore/plugin_datastore_mysql.c:1254
 #: src/psycstore/plugin_psycstore_mysql.c:1936
 msgid "Mysql database running\n"
 msgstr "MySQL-Datenbank läuft\n"
 
-#: src/datastore/plugin_datastore_postgres.c:345
+#: src/datastore/plugin_datastore_postgres.c:350
 msgid "Postgress exec failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:975
+#: src/datastore/plugin_datastore_postgres.c:977
 #, fuzzy
 msgid "Failed to drop table from database.\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/datastore/plugin_datastore_postgres.c:1012
+#: src/datastore/plugin_datastore_postgres.c:1014
 #: src/namecache/plugin_namecache_postgres.c:398
 #: src/namestore/plugin_namestore_postgres.c:571
 #: src/psycstore/plugin_psycstore_postgres.c:1721
@@ -1838,29 +1838,29 @@ msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "SQLite-Datenbank konnte nicht initialisiert werden: %s.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:688
+#: src/datastore/plugin_datastore_sqlite.c:692
 #, fuzzy
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr "Ungültige Daten in %s. Korrektur wird versucht (durch Löschung).\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1185
+#: src/datastore/plugin_datastore_sqlite.c:1189
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1205
+#: src/datastore/plugin_datastore_sqlite.c:1209
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1245
+#: src/datastore/plugin_datastore_sqlite.c:1249
 #: src/namecache/plugin_namecache_sqlite.c:580
 #: src/namestore/plugin_namestore_sqlite.c:766
 msgid "Sqlite database running\n"
 msgstr "Sqlite-Datenbank läuft\n"
 
-#: src/datastore/plugin_datastore_template.c:260
+#: src/datastore/plugin_datastore_template.c:258
 msgid "Template database running\n"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index 3394e89ad..5a49f5b0d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.9.5a\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-02-20 11:12-0600\n"
+"POT-Creation-Date: 2017-02-20 12:08-0600\n"
 "PO-Revision-Date: 2013-02-23 17:50+0100\n"
 "Last-Translator: Miguel Ángel Arruga Vivas <address@hidden>\n"
 "Language-Team: Spanish <address@hidden>\n"
@@ -1591,7 +1591,7 @@ msgstr "Caché de datos de montículo (heap) ejecutándose\n"
 
 #: src/datacache/plugin_datacache_sqlite.c:77
 #: src/datacache/plugin_datacache_sqlite.c:86
-#: src/datastore/plugin_datastore_mysql.c:1027
+#: src/datastore/plugin_datastore_mysql.c:1024
 #: src/datastore/plugin_datastore_sqlite.c:57
 #: src/datastore/plugin_datastore_sqlite.c:65 src/my/my.c:80 src/my/my.c:92
 #: src/mysql/mysql.c:42 src/mysql/mysql.c:49
@@ -1613,7 +1613,7 @@ msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "«%s» falló en %s: %d con el error: %s\n"
 
 #: src/datacache/plugin_datacache_sqlite.c:749
-#: src/datastore/plugin_datastore_sqlite.c:409
+#: src/datastore/plugin_datastore_sqlite.c:415
 #: src/namecache/plugin_namecache_sqlite.c:292
 #: src/namestore/plugin_namestore_sqlite.c:343
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
@@ -1860,12 +1860,12 @@ msgstr ""
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Se produjo un fallo al inicializar «bloomfilter».\n"
 
-#: src/datastore/plugin_datastore_heap.c:824
+#: src/datastore/plugin_datastore_heap.c:823
 msgid "Heap database running\n"
 msgstr "Base de datos de montículo ejecutándose\n"
 
 #: src/datastore/plugin_datastore_mysql.c:347
-#: src/datastore/plugin_datastore_sqlite.c:507
+#: src/datastore/plugin_datastore_sqlite.c:513
 #, fuzzy
 msgid "Data too large"
 msgstr "número de valores"
@@ -1874,25 +1874,25 @@ msgstr "número de valores"
 msgid "MySQL statement run failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:983
+#: src/datastore/plugin_datastore_mysql.c:980
 #, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr "«%s» para «%s» falló en %s: %d con error: %s\n"
 
-#: src/datastore/plugin_datastore_mysql.c:1257
+#: src/datastore/plugin_datastore_mysql.c:1254
 #: src/psycstore/plugin_psycstore_mysql.c:1936
 msgid "Mysql database running\n"
 msgstr "Base de datos Mysql ejecutándose\n"
 
-#: src/datastore/plugin_datastore_postgres.c:345
+#: src/datastore/plugin_datastore_postgres.c:350
 msgid "Postgress exec failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:975
+#: src/datastore/plugin_datastore_postgres.c:977
 msgid "Failed to drop table from database.\n"
 msgstr "Se produjo un fallo al borrar una tabla de la base de datos.\n"
 
-#: src/datastore/plugin_datastore_postgres.c:1012
+#: src/datastore/plugin_datastore_postgres.c:1014
 #: src/namecache/plugin_namecache_postgres.c:398
 #: src/namestore/plugin_namestore_postgres.c:571
 #: src/psycstore/plugin_psycstore_postgres.c:1721
@@ -1916,19 +1916,19 @@ msgstr "«%s» falló en %s:%u con el error: %s"
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Imposible inicializar SQLite: %s.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:688
+#: src/datastore/plugin_datastore_sqlite.c:692
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr ""
 "Datos no válidos en la base de datos.  Intentando arreglar (por borrado).\n"
 
 # to should be too, i think
-#: src/datastore/plugin_datastore_sqlite.c:1185
+#: src/datastore/plugin_datastore_sqlite.c:1189
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 "la versión de sqlite es muy antigua para determinar el tamaño, se asume "
 "cero\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1205
+#: src/datastore/plugin_datastore_sqlite.c:1209
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
@@ -1937,13 +1937,13 @@ msgstr ""
 "Usando la utilización de páginas de sqlite para estimar el «payload» (%llu "
 "páginas de %llu bytes de tamaño)\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1245
+#: src/datastore/plugin_datastore_sqlite.c:1249
 #: src/namecache/plugin_namecache_sqlite.c:580
 #: src/namestore/plugin_namestore_sqlite.c:766
 msgid "Sqlite database running\n"
 msgstr "Base de datos sqlite ejecutándose\n"
 
-#: src/datastore/plugin_datastore_template.c:260
+#: src/datastore/plugin_datastore_template.c:258
 msgid "Template database running\n"
 msgstr "Base de datos de plantilla ejecutándose\n"
 
diff --git a/po/fr.po b/po/fr.po
index 4804c8898..1d261c0e8 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-02-20 11:12-0600\n"
+"POT-Creation-Date: 2017-02-20 12:08-0600\n"
 "PO-Revision-Date: 2015-12-24 01:20+0100\n"
 "Last-Translator: Stéphane  Aulery <address@hidden>\n"
 "Language-Team: French <address@hidden>\n"
@@ -1471,7 +1471,7 @@ msgstr ""
 
 #: src/datacache/plugin_datacache_sqlite.c:77
 #: src/datacache/plugin_datacache_sqlite.c:86
-#: src/datastore/plugin_datastore_mysql.c:1027
+#: src/datastore/plugin_datastore_mysql.c:1024
 #: src/datastore/plugin_datastore_sqlite.c:57
 #: src/datastore/plugin_datastore_sqlite.c:65 src/my/my.c:80 src/my/my.c:92
 #: src/mysql/mysql.c:42 src/mysql/mysql.c:49
@@ -1493,7 +1493,7 @@ msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr ""
 
 #: src/datacache/plugin_datacache_sqlite.c:749
-#: src/datastore/plugin_datastore_sqlite.c:409
+#: src/datastore/plugin_datastore_sqlite.c:415
 #: src/namecache/plugin_namecache_sqlite.c:292
 #: src/namestore/plugin_namestore_sqlite.c:343
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
@@ -1723,12 +1723,12 @@ msgstr ""
 msgid "Failed to initialize bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_heap.c:824
+#: src/datastore/plugin_datastore_heap.c:823
 msgid "Heap database running\n"
 msgstr ""
 
 #: src/datastore/plugin_datastore_mysql.c:347
-#: src/datastore/plugin_datastore_sqlite.c:507
+#: src/datastore/plugin_datastore_sqlite.c:513
 msgid "Data too large"
 msgstr ""
 
@@ -1736,25 +1736,25 @@ msgstr ""
 msgid "MySQL statement run failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:983
+#: src/datastore/plugin_datastore_mysql.c:980
 #, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:1257
+#: src/datastore/plugin_datastore_mysql.c:1254
 #: src/psycstore/plugin_psycstore_mysql.c:1936
 msgid "Mysql database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:345
+#: src/datastore/plugin_datastore_postgres.c:350
 msgid "Postgress exec failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:975
+#: src/datastore/plugin_datastore_postgres.c:977
 msgid "Failed to drop table from database.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:1012
+#: src/datastore/plugin_datastore_postgres.c:1014
 #: src/namecache/plugin_namecache_postgres.c:398
 #: src/namestore/plugin_namestore_postgres.c:571
 #: src/psycstore/plugin_psycstore_postgres.c:1721
@@ -1778,28 +1778,28 @@ msgstr ""
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:688
+#: src/datastore/plugin_datastore_sqlite.c:692
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1185
+#: src/datastore/plugin_datastore_sqlite.c:1189
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1205
+#: src/datastore/plugin_datastore_sqlite.c:1209
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1245
+#: src/datastore/plugin_datastore_sqlite.c:1249
 #: src/namecache/plugin_namecache_sqlite.c:580
 #: src/namestore/plugin_namestore_sqlite.c:766
 msgid "Sqlite database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_template.c:260
+#: src/datastore/plugin_datastore_template.c:258
 msgid "Template database running\n"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index 3045bac2f..78958cbab 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-02-20 11:12-0600\n"
+"POT-Creation-Date: 2017-02-20 12:08-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"
@@ -1549,7 +1549,7 @@ msgstr ""
 
 #: src/datacache/plugin_datacache_sqlite.c:77
 #: src/datacache/plugin_datacache_sqlite.c:86
-#: src/datastore/plugin_datastore_mysql.c:1027
+#: src/datastore/plugin_datastore_mysql.c:1024
 #: src/datastore/plugin_datastore_sqlite.c:57
 #: src/datastore/plugin_datastore_sqlite.c:65 src/my/my.c:80 src/my/my.c:92
 #: src/mysql/mysql.c:42 src/mysql/mysql.c:49
@@ -1571,7 +1571,7 @@ msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
 #: src/datacache/plugin_datacache_sqlite.c:749
-#: src/datastore/plugin_datastore_sqlite.c:409
+#: src/datastore/plugin_datastore_sqlite.c:415
 #: src/namecache/plugin_namecache_sqlite.c:292
 #: src/namestore/plugin_namestore_sqlite.c:343
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
@@ -1812,12 +1812,12 @@ msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/datastore/plugin_datastore_heap.c:824
+#: src/datastore/plugin_datastore_heap.c:823
 msgid "Heap database running\n"
 msgstr ""
 
 #: src/datastore/plugin_datastore_mysql.c:347
-#: src/datastore/plugin_datastore_sqlite.c:507
+#: src/datastore/plugin_datastore_sqlite.c:513
 #, fuzzy
 msgid "Data too large"
 msgstr "antal iterationer"
@@ -1826,26 +1826,26 @@ msgstr "antal iterationer"
 msgid "MySQL statement run failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:983
+#: src/datastore/plugin_datastore_mysql.c:980
 #, fuzzy, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr "\"%s\" till \"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/datastore/plugin_datastore_mysql.c:1257
+#: src/datastore/plugin_datastore_mysql.c:1254
 #: src/psycstore/plugin_psycstore_mysql.c:1936
 msgid "Mysql database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:345
+#: src/datastore/plugin_datastore_postgres.c:350
 msgid "Postgress exec failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:975
+#: src/datastore/plugin_datastore_postgres.c:977
 #, fuzzy
 msgid "Failed to drop table from database.\n"
 msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
-#: src/datastore/plugin_datastore_postgres.c:1012
+#: src/datastore/plugin_datastore_postgres.c:1014
 #: src/namecache/plugin_namecache_postgres.c:398
 #: src/namestore/plugin_namestore_postgres.c:571
 #: src/psycstore/plugin_psycstore_postgres.c:1721
@@ -1869,28 +1869,28 @@ msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:688
+#: src/datastore/plugin_datastore_sqlite.c:692
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1185
+#: src/datastore/plugin_datastore_sqlite.c:1189
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1205
+#: src/datastore/plugin_datastore_sqlite.c:1209
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1245
+#: src/datastore/plugin_datastore_sqlite.c:1249
 #: src/namecache/plugin_namecache_sqlite.c:580
 #: src/namestore/plugin_namestore_sqlite.c:766
 msgid "Sqlite database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_template.c:260
+#: src/datastore/plugin_datastore_template.c:258
 msgid "Template database running\n"
 msgstr ""
 
diff --git a/po/vi.po b/po/vi.po
index d72459daa..db522ea47 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.8.0a\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-02-20 11:12-0600\n"
+"POT-Creation-Date: 2017-02-20 12:08-0600\n"
 "PO-Revision-Date: 2008-09-10 22:05+0930\n"
 "Last-Translator: Clytie Siddall <address@hidden>\n"
 "Language-Team: Vietnamese <address@hidden>\n"
@@ -1558,7 +1558,7 @@ msgstr "kho dữ liệu sqlite"
 
 #: src/datacache/plugin_datacache_sqlite.c:77
 #: src/datacache/plugin_datacache_sqlite.c:86
-#: src/datastore/plugin_datastore_mysql.c:1027
+#: src/datastore/plugin_datastore_mysql.c:1024
 #: src/datastore/plugin_datastore_sqlite.c:57
 #: src/datastore/plugin_datastore_sqlite.c:65 src/my/my.c:80 src/my/my.c:92
 #: src/mysql/mysql.c:42 src/mysql/mysql.c:49
@@ -1580,7 +1580,7 @@ msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s\n"
 
 #: src/datacache/plugin_datacache_sqlite.c:749
-#: src/datastore/plugin_datastore_sqlite.c:409
+#: src/datastore/plugin_datastore_sqlite.c:415
 #: src/namecache/plugin_namecache_sqlite.c:292
 #: src/namestore/plugin_namestore_sqlite.c:343
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
@@ -1827,13 +1827,13 @@ msgstr "Không thể lưu tập tin cấu hình « %s »:"
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/datastore/plugin_datastore_heap.c:824
+#: src/datastore/plugin_datastore_heap.c:823
 #, fuzzy
 msgid "Heap database running\n"
 msgstr "kho dữ liệu sqlite"
 
 #: src/datastore/plugin_datastore_mysql.c:347
-#: src/datastore/plugin_datastore_sqlite.c:507
+#: src/datastore/plugin_datastore_sqlite.c:513
 #, fuzzy
 msgid "Data too large"
 msgstr "số lần lặp lại"
@@ -1842,28 +1842,28 @@ msgstr "số lần lặp lại"
 msgid "MySQL statement run failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:983
+#: src/datastore/plugin_datastore_mysql.c:980
 #, fuzzy, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s\n"
 
-#: src/datastore/plugin_datastore_mysql.c:1257
+#: src/datastore/plugin_datastore_mysql.c:1254
 #: src/psycstore/plugin_psycstore_mysql.c:1936
 msgid "Mysql database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:345
+#: src/datastore/plugin_datastore_postgres.c:350
 msgid "Postgress exec failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:975
+#: src/datastore/plugin_datastore_postgres.c:977
 #, fuzzy
 msgid "Failed to drop table from database.\n"
 msgstr ""
 "\n"
 "Không nhận được đáp ứng từ gnunetd.\n"
 
-#: src/datastore/plugin_datastore_postgres.c:1012
+#: src/datastore/plugin_datastore_postgres.c:1014
 #: src/namecache/plugin_namecache_postgres.c:398
 #: src/namestore/plugin_namestore_postgres.c:571
 #: src/psycstore/plugin_psycstore_postgres.c:1721
@@ -1887,30 +1887,30 @@ msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s"
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:688
+#: src/datastore/plugin_datastore_sqlite.c:692
 #, fuzzy
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr "Dữ liệu sai trong %s. Đang thử sửa chữa (bằng cách xoá).\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1185
+#: src/datastore/plugin_datastore_sqlite.c:1189
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1205
+#: src/datastore/plugin_datastore_sqlite.c:1209
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1245
+#: src/datastore/plugin_datastore_sqlite.c:1249
 #: src/namecache/plugin_namecache_sqlite.c:580
 #: src/namestore/plugin_namestore_sqlite.c:766
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "kho dữ liệu sqlite"
 
-#: src/datastore/plugin_datastore_template.c:260
+#: src/datastore/plugin_datastore_template.c:258
 msgid "Template database running\n"
 msgstr ""
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ef3e1830b..f28a878a5 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2017-02-20 11:12-0600\n"
+"POT-Creation-Date: 2017-02-20 12:08-0600\n"
 "PO-Revision-Date: 2011-07-09 12:12+0800\n"
 "Last-Translator: Wylmer Wang <address@hidden>\n"
 "Language-Team: Chinese (simplified) <address@hidden>\n"
@@ -1508,7 +1508,7 @@ msgstr "sqlite 数据仓库"
 
 #: src/datacache/plugin_datacache_sqlite.c:77
 #: src/datacache/plugin_datacache_sqlite.c:86
-#: src/datastore/plugin_datastore_mysql.c:1027
+#: src/datastore/plugin_datastore_mysql.c:1024
 #: src/datastore/plugin_datastore_sqlite.c:57
 #: src/datastore/plugin_datastore_sqlite.c:65 src/my/my.c:80 src/my/my.c:92
 #: src/mysql/mysql.c:42 src/mysql/mysql.c:49
@@ -1530,7 +1530,7 @@ msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
 
 #: src/datacache/plugin_datacache_sqlite.c:749
-#: src/datastore/plugin_datastore_sqlite.c:409
+#: src/datastore/plugin_datastore_sqlite.c:415
 #: src/namecache/plugin_namecache_sqlite.c:292
 #: src/namestore/plugin_namestore_sqlite.c:343
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
@@ -1762,13 +1762,13 @@ msgstr "解析配置文件“%s”失败\n"
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/datastore/plugin_datastore_heap.c:824
+#: src/datastore/plugin_datastore_heap.c:823
 #, fuzzy
 msgid "Heap database running\n"
 msgstr "sqlite 数据仓库"
 
 #: src/datastore/plugin_datastore_mysql.c:347
-#: src/datastore/plugin_datastore_sqlite.c:507
+#: src/datastore/plugin_datastore_sqlite.c:513
 #, fuzzy
 msgid "Data too large"
 msgstr "迭代次数"
@@ -1777,26 +1777,26 @@ msgstr "迭代次数"
 msgid "MySQL statement run failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:983
+#: src/datastore/plugin_datastore_mysql.c:980
 #, fuzzy, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
 
-#: src/datastore/plugin_datastore_mysql.c:1257
+#: src/datastore/plugin_datastore_mysql.c:1254
 #: src/psycstore/plugin_psycstore_mysql.c:1936
 msgid "Mysql database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:345
+#: src/datastore/plugin_datastore_postgres.c:350
 msgid "Postgress exec failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:975
+#: src/datastore/plugin_datastore_postgres.c:977
 #, fuzzy
 msgid "Failed to drop table from database.\n"
 msgstr "发送消息失败。\n"
 
-#: src/datastore/plugin_datastore_postgres.c:1012
+#: src/datastore/plugin_datastore_postgres.c:1014
 #: src/namecache/plugin_namecache_postgres.c:398
 #: src/namestore/plugin_namestore_postgres.c:571
 #: src/psycstore/plugin_psycstore_postgres.c:1721
@@ -1820,30 +1820,30 @@ msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "无法初始化 SQLite：%s。\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:688
+#: src/datastore/plugin_datastore_sqlite.c:692
 #, fuzzy
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr "%s 中有无效数据。请尝试修复(删除之)。\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1185
+#: src/datastore/plugin_datastore_sqlite.c:1189
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1205
+#: src/datastore/plugin_datastore_sqlite.c:1209
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1245
+#: src/datastore/plugin_datastore_sqlite.c:1249
 #: src/namecache/plugin_namecache_sqlite.c:580
 #: src/namestore/plugin_namestore_sqlite.c:766
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "sqlite 数据仓库"
 
-#: src/datastore/plugin_datastore_template.c:260
+#: src/datastore/plugin_datastore_template.c:258
 msgid "Template database running\n"
 msgstr ""
 
diff --git a/src/datastore/gnunet-service-datastore.c 
b/src/datastore/gnunet-service-datastore.c
index 6f1bd2b6d..445c3576e 100644
--- a/src/datastore/gnunet-service-datastore.c
+++ b/src/datastore/gnunet-service-datastore.c
@@ -889,7 +889,7 @@ check_present (void *cls,
          expiration.abs_value_us))
       plugin->api->update (plugin->api->cls,
                           uid,
-                           (int32_t) ntohl (dm->priority),
+                           ntohl (dm->priority),
                            GNUNET_TIME_absolute_ntoh (dm->expiration),
                            &check_present_continuation,
                           pc->client);
diff --git a/src/datastore/plugin_datastore_heap.c 
b/src/datastore/plugin_datastore_heap.c
index 977d599d2..199c03a50 100644
--- a/src/datastore/plugin_datastore_heap.c
+++ b/src/datastore/plugin_datastore_heap.c
@@ -611,9 +611,7 @@ heap_plugin_get_expiration (void *cls, PluginDatumProcessor 
proc,
  * @param cls our `struct Plugin *`
  * @param uid unique identifier of the datum
  * @param delta by how much should the priority
- *     change?  If priority + delta < 0 the
- *     priority should be set to 0 (never go
- *     negative).
+ *     change?
  * @param expire new expiration time should be the
  *     MAX of any existing expiration time and
  *     this value
@@ -623,7 +621,7 @@ heap_plugin_get_expiration (void *cls, PluginDatumProcessor 
proc,
 static void
 heap_plugin_update (void *cls,
                    uint64_t uid,
-                   int delta,
+                   uint32_t delta,
                    struct GNUNET_TIME_Absolute expire,
                    PluginUpdateCont cont,
                    void *cont_cls)
@@ -638,8 +636,9 @@ heap_plugin_update (void *cls,
     GNUNET_CONTAINER_heap_update_cost (value->expire_heap,
                                       expire.abs_value_us);
   }
-  if ( (delta < 0) && (value->priority < - delta) )
-    value->priority = 0;
+  /* Saturating add, don't overflow */
+  if (value->priority > UINT32_MAX - delta)
+    value->priority = UINT32_MAX;
   else
     value->priority += delta;
   cont (cont_cls, GNUNET_OK, NULL);
diff --git a/src/datastore/plugin_datastore_mysql.c 
b/src/datastore/plugin_datastore_mysql.c
index d76b4ccb4..1067064aa 100644
--- a/src/datastore/plugin_datastore_mysql.c
+++ b/src/datastore/plugin_datastore_mysql.c
@@ -395,9 +395,7 @@ mysql_plugin_put (void *cls,
  * @param cls our "struct Plugin*"
  * @param uid unique identifier of the datum
  * @param delta by how much should the priority
- *     change?  If priority + delta < 0 the
- *     priority should be set to 0 (never go
- *     negative).
+ *     change?
  * @param expire new expiration time should be the
  *     MAX of any existing expiration time and
  *     this value
@@ -407,13 +405,12 @@ mysql_plugin_put (void *cls,
 static void
 mysql_plugin_update (void *cls,
                      uint64_t uid,
-                     int delta,
+                     uint32_t delta,
                      struct GNUNET_TIME_Absolute expire,
                      PluginUpdateCont cont,
                      void *cont_cls)
 {
   struct Plugin *plugin = cls;
-  uint32_t idelta = (uint32_t) delta;
   uint64_t lexpire = expire.abs_value_us;
   int ret;
 
@@ -424,7 +421,7 @@ mysql_plugin_update (void *cls,
              GNUNET_STRINGS_absolute_time_to_string (expire));
 
   struct GNUNET_MY_QueryParam params_update[] = {
-    GNUNET_MY_query_param_uint32 (&idelta),
+    GNUNET_MY_query_param_uint32 (&delta),
     GNUNET_MY_query_param_uint64 (&lexpire),
     GNUNET_MY_query_param_uint64 (&lexpire),
     GNUNET_MY_query_param_uint64 (&uid),
diff --git a/src/datastore/plugin_datastore_postgres.c 
b/src/datastore/plugin_datastore_postgres.c
index 994118bfa..7b04cc68a 100644
--- a/src/datastore/plugin_datastore_postgres.c
+++ b/src/datastore/plugin_datastore_postgres.c
@@ -76,6 +76,11 @@ init_connection (struct Plugin *plugin)
   if (NULL == plugin->dbh)
     return GNUNET_SYSERR;
 
+  /* FIXME: PostgreSQL does not have unsigned integers! This is ok for the 
type column because
+   * we only test equality on it and can cast it to/from uint32_t. For repl, 
prio, and anonLevel
+   * we do math or inequality tests, so we can't handle the entire range of 
uint32_t.
+   * This will also cause problems for expiration times after 
294247-01-10-04:00:54 UTC.
+   */
   ret =
       PQexec (plugin->dbh,
               "CREATE TABLE IF NOT EXISTS gn090 ("
@@ -869,9 +874,7 @@ postgres_plugin_get_expiration (void *cls,
  * @param cls our `struct Plugin *`
  * @param uid unique identifier of the datum
  * @param delta by how much should the priority
- *     change?  If priority + delta < 0 the
- *     priority should be set to 0 (never go
- *     negative).
+ *     change?
  * @param expire new expiration time should be the
  *     MAX of any existing expiration time and
  *     this value
@@ -881,16 +884,15 @@ postgres_plugin_get_expiration (void *cls,
 static void
 postgres_plugin_update (void *cls,
                        uint64_t uid,
-                       int delta,
+                       uint32_t delta,
                         struct GNUNET_TIME_Absolute expire,
                         PluginUpdateCont cont,
                        void *cont_cls)
 {
   struct Plugin *plugin = cls;
-  uint32_t idelta = delta;
   uint32_t oid = (uint32_t) uid;
   struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint32 (&idelta),
+    GNUNET_PQ_query_param_uint32 (&delta),
     GNUNET_PQ_query_param_absolute_time (&expire),
     GNUNET_PQ_query_param_uint32 (&oid),
     GNUNET_PQ_query_param_end
diff --git a/src/datastore/plugin_datastore_sqlite.c 
b/src/datastore/plugin_datastore_sqlite.c
index 18a3aa4ac..028117d26 100644
--- a/src/datastore/plugin_datastore_sqlite.c
+++ b/src/datastore/plugin_datastore_sqlite.c
@@ -291,6 +291,12 @@ database_setup (const struct GNUNET_CONFIGURATION_Handle 
*cfg,
          sq_prepare (plugin->dbh,
                      "SELECT 1 FROM sqlite_master WHERE tbl_name = 'gn090'",
                      &stmt));
+
+  /* FIXME: SQLite does not have unsigned integers! This is ok for the type 
column because
+   * we only test equality on it and can cast it to/from uint32_t. For repl, 
prio, and anonLevel
+   * we do math or inequality tests, so we can't handle the entire range of 
uint32_t.
+   * This will also cause problems for expiration times after 
294247-01-10-04:00:54 UTC.
+   */
   if ((sqlite3_step (stmt) == SQLITE_DONE) &&
       (sqlite3_exec
        (plugin->dbh,
@@ -593,9 +599,7 @@ sqlite_plugin_put (void *cls,
  * @param cls the plugin context (state for this module)
  * @param uid unique identifier of the datum
  * @param delta by how much should the priority
- *     change?  If priority + delta < 0 the
- *     priority should be set to 0 (never go
- *     negative).
+ *     change?
  * @param expire new expiration time should be the
  *     MAX of any existing expiration time and
  *     this value
@@ -605,7 +609,7 @@ sqlite_plugin_put (void *cls,
 static void
 sqlite_plugin_update (void *cls,
                       uint64_t uid,
-                      int delta,
+                      uint32_t delta,
                       struct GNUNET_TIME_Absolute expire,
                       PluginUpdateCont cont,
                       void *cont_cls)
diff --git a/src/datastore/plugin_datastore_template.c 
b/src/datastore/plugin_datastore_template.c
index fdd4fb157..a1e03e8ee 100644
--- a/src/datastore/plugin_datastore_template.c
+++ b/src/datastore/plugin_datastore_template.c
@@ -164,9 +164,7 @@ template_plugin_get_expiration (void *cls, 
PluginDatumProcessor proc,
  * @param cls our "struct Plugin*"
  * @param uid unique identifier of the datum
  * @param delta by how much should the priority
- *     change?  If priority + delta < 0 the
- *     priority should be set to 0 (never go
- *     negative).
+ *     change?
  * @param expire new expiration time should be the
  *     MAX of any existing expiration time and
  *     this value
@@ -174,7 +172,7 @@ template_plugin_get_expiration (void *cls, 
PluginDatumProcessor proc,
  * @param cons_cls continuation closure
  */
 static void
-template_plugin_update (void *cls, uint64_t uid, int delta,
+template_plugin_update (void *cls, uint64_t uid, uint32_t delta,
                         struct GNUNET_TIME_Absolute expire,
                         PluginUpdateCont cont, void *cont_cls)
 {
diff --git a/src/include/gnunet_datastore_plugin.h 
b/src/include/gnunet_datastore_plugin.h
index 71c69ffaf..2295d4e72 100644
--- a/src/include/gnunet_datastore_plugin.h
+++ b/src/include/gnunet_datastore_plugin.h
@@ -268,9 +268,7 @@ typedef void
  * @param cls closure
  * @param uid unique identifier of the datum
  * @param delta by how much should the priority
- *     change?  If priority + delta < 0 the
- *     priority should be set to 0 (never go
- *     negative).
+ *     change?
  * @param expire new expiration time should be the
  *     MAX of any existing expiration time and
  *     this value
@@ -280,7 +278,7 @@ typedef void
 typedef void
 (*PluginUpdate) (void *cls,
                 uint64_t uid,
-                int delta,
+                uint32_t delta,
                 struct GNUNET_TIME_Absolute expire,
                 PluginUpdateCont cont,
                 void *cont_cls);

-- 
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread]
Current Thread
[Next in Thread]
[GNUnet-SVN] [gnunet] branch master updated (f553963d6 -> 9bb2b2522), gnunet <=
- [GNUnet-SVN] [gnunet] 01/02: Restrict update to positive priority deltas, gnunet, 2017/02/20
- [GNUnet-SVN] [gnunet] 02/02: Update po files, gnunet, 2017/02/20
Prev by Date: [GNUnet-SVN] [gnunet] 01/02: Restrict update to positive priority deltas
Next by Date: [GNUnet-SVN] [gnunet] 02/02: Update po files
Previous by thread: [GNUnet-SVN] [taler-merchant-frontend-examples] branch master updated: Going on with Python tutorial..
Next by thread: [GNUnet-SVN] [gnunet] 01/02: Restrict update to positive priority deltas
Index(es):
- Date
- Thread