diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-12-24 13:51:03 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-12-24 13:51:03 +0000 |
commit | c77bdc9b0fec7ce8201c5f3f5c915485abaf2dcd (patch) | |
tree | ffd025160bc323c4b84a7ab5f431b1419ac39903 | |
parent | 41a801e9f6ddbcf4a8ff5d178482fcd025d5ab05 (diff) | |
download | gnunet-c77bdc9b0fec7ce8201c5f3f5c915485abaf2dcd.tar.gz gnunet-c77bdc9b0fec7ce8201c5f3f5c915485abaf2dcd.zip |
-let's not introduce stdbool shortly before the release
-rw-r--r-- | po/de.po | 36 | ||||
-rw-r--r-- | po/es.po | 36 | ||||
-rw-r--r-- | po/sv.po | 36 | ||||
-rw-r--r-- | po/vi.po | 36 | ||||
-rw-r--r-- | po/zh_CN.po | 36 | ||||
-rw-r--r-- | src/include/gnunet_scheduler_lib.h | 16 | ||||
-rw-r--r-- | src/util/scheduler.c | 22 |
7 files changed, 108 insertions, 110 deletions
@@ -7,7 +7,7 @@ msgid "" | |||
7 | msgstr "" | 7 | msgstr "" |
8 | "Project-Id-Version: GNUnet 0.7.0b\n" | 8 | "Project-Id-Version: GNUnet 0.7.0b\n" |
9 | "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" | 9 | "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" |
10 | "POT-Creation-Date: 2013-12-23 22:54+0100\n" | 10 | "POT-Creation-Date: 2013-12-23 23:34+0100\n" |
11 | "PO-Revision-Date: 2006-03-17 21:37+0100\n" | 11 | "PO-Revision-Date: 2006-03-17 21:37+0100\n" |
12 | "Last-Translator: Nils Durner <durner@gnunet.org>\n" | 12 | "Last-Translator: Nils Durner <durner@gnunet.org>\n" |
13 | "Language-Team: German <de@li.org>\n" | 13 | "Language-Team: German <de@li.org>\n" |
@@ -17,7 +17,7 @@ msgstr "" | |||
17 | "Content-Transfer-Encoding: 8bit\n" | 17 | "Content-Transfer-Encoding: 8bit\n" |
18 | "Plural-Forms: nplurals=2; plural=(n != 1);\n" | 18 | "Plural-Forms: nplurals=2; plural=(n != 1);\n" |
19 | 19 | ||
20 | #: src/arm/arm_api.c:336 | 20 | #: src/arm/arm_api.c:337 |
21 | msgid "Client was disconnected from arm service, trying to reconnect.\n" | 21 | msgid "Client was disconnected from arm service, trying to reconnect.\n" |
22 | msgstr "" | 22 | msgstr "" |
23 | 23 | ||
@@ -266,80 +266,80 @@ msgstr "Anfrage konnte nicht an gnunetd gesendet werden.\n" | |||
266 | msgid "Could not send list result to client\n" | 266 | msgid "Could not send list result to client\n" |
267 | msgstr "Anfrage konnte nicht an gnunetd gesendet werden.\n" | 267 | msgstr "Anfrage konnte nicht an gnunetd gesendet werden.\n" |
268 | 268 | ||
269 | #: src/arm/gnunet-service-arm.c:528 | 269 | #: src/arm/gnunet-service-arm.c:529 |
270 | #, fuzzy, c-format | 270 | #, fuzzy, c-format |
271 | msgid "Failed to start service `%s'\n" | 271 | msgid "Failed to start service `%s'\n" |
272 | msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n" | 272 | msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n" |
273 | 273 | ||
274 | #: src/arm/gnunet-service-arm.c:535 | 274 | #: src/arm/gnunet-service-arm.c:540 |
275 | #, fuzzy, c-format | 275 | #, fuzzy, c-format |
276 | msgid "Starting service `%s'\n" | 276 | msgid "Starting service `%s'\n" |
277 | msgstr "Collection `%s' begonnen.\n" | 277 | msgstr "Collection `%s' begonnen.\n" |
278 | 278 | ||
279 | #: src/arm/gnunet-service-arm.c:634 | 279 | #: src/arm/gnunet-service-arm.c:639 |
280 | #, fuzzy, c-format | 280 | #, fuzzy, c-format |
281 | msgid "Unable to create socket for service `%s': %s\n" | 281 | msgid "Unable to create socket for service `%s': %s\n" |
282 | msgstr "Fehler beim Anlegen des Benutzerkontos:" | 282 | msgstr "Fehler beim Anlegen des Benutzerkontos:" |
283 | 283 | ||
284 | #: src/arm/gnunet-service-arm.c:656 | 284 | #: src/arm/gnunet-service-arm.c:661 |
285 | #, c-format | 285 | #, c-format |
286 | msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n" | 286 | msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n" |
287 | msgstr "" | 287 | msgstr "" |
288 | 288 | ||
289 | #: src/arm/gnunet-service-arm.c:685 | 289 | #: src/arm/gnunet-service-arm.c:690 |
290 | #, c-format | 290 | #, c-format |
291 | msgid "ARM now monitors connections to service `%s' at `%s'\n" | 291 | msgid "ARM now monitors connections to service `%s' at `%s'\n" |
292 | msgstr "" | 292 | msgstr "" |
293 | 293 | ||
294 | #: src/arm/gnunet-service-arm.c:821 | 294 | #: src/arm/gnunet-service-arm.c:826 |
295 | #, fuzzy, c-format | 295 | #, fuzzy, c-format |
296 | msgid "Preparing to stop `%s'\n" | 296 | msgid "Preparing to stop `%s'\n" |
297 | msgstr "Collection `%s' begonnen.\n" | 297 | msgstr "Collection `%s' begonnen.\n" |
298 | 298 | ||
299 | #: src/arm/gnunet-service-arm.c:1085 | 299 | #: src/arm/gnunet-service-arm.c:1095 |
300 | #, fuzzy, c-format | 300 | #, fuzzy, c-format |
301 | msgid "Restarting service `%s'.\n" | 301 | msgid "Restarting service `%s'.\n" |
302 | msgstr "Collection `%s' begonnen.\n" | 302 | msgstr "Collection `%s' begonnen.\n" |
303 | 303 | ||
304 | #: src/arm/gnunet-service-arm.c:1178 | 304 | #: src/arm/gnunet-service-arm.c:1188 |
305 | msgid "exit" | 305 | msgid "exit" |
306 | msgstr "" | 306 | msgstr "" |
307 | 307 | ||
308 | #: src/arm/gnunet-service-arm.c:1183 | 308 | #: src/arm/gnunet-service-arm.c:1193 |
309 | msgid "signal" | 309 | msgid "signal" |
310 | msgstr "" | 310 | msgstr "" |
311 | 311 | ||
312 | #: src/arm/gnunet-service-arm.c:1188 | 312 | #: src/arm/gnunet-service-arm.c:1198 |
313 | #, fuzzy | 313 | #, fuzzy |
314 | msgid "unknown" | 314 | msgid "unknown" |
315 | msgstr "Unbekannter Fehler" | 315 | msgstr "Unbekannter Fehler" |
316 | 316 | ||
317 | #: src/arm/gnunet-service-arm.c:1194 | 317 | #: src/arm/gnunet-service-arm.c:1204 |
318 | #, fuzzy, c-format | 318 | #, fuzzy, c-format |
319 | msgid "Service `%s' took %s to terminate\n" | 319 | msgid "Service `%s' took %s to terminate\n" |
320 | msgstr "Dienst gelöscht.\n" | 320 | msgstr "Dienst gelöscht.\n" |
321 | 321 | ||
322 | #: src/arm/gnunet-service-arm.c:1216 | 322 | #: src/arm/gnunet-service-arm.c:1226 |
323 | #, c-format | 323 | #, c-format |
324 | msgid "Service `%s' terminated normally, will restart at any time\n" | 324 | msgid "Service `%s' terminated normally, will restart at any time\n" |
325 | msgstr "" | 325 | msgstr "" |
326 | 326 | ||
327 | #: src/arm/gnunet-service-arm.c:1231 | 327 | #: src/arm/gnunet-service-arm.c:1241 |
328 | #, c-format | 328 | #, c-format |
329 | msgid "Service `%s' terminated with status %s/%d, will restart in %s\n" | 329 | msgid "Service `%s' terminated with status %s/%d, will restart in %s\n" |
330 | msgstr "" | 330 | msgstr "" |
331 | 331 | ||
332 | #: src/arm/gnunet-service-arm.c:1484 | 332 | #: src/arm/gnunet-service-arm.c:1495 |
333 | #, fuzzy, c-format | 333 | #, fuzzy, c-format |
334 | msgid "Starting default services `%s'\n" | 334 | msgid "Starting default services `%s'\n" |
335 | msgstr "Collection `%s' begonnen.\n" | 335 | msgstr "Collection `%s' begonnen.\n" |
336 | 336 | ||
337 | #: src/arm/gnunet-service-arm.c:1495 | 337 | #: src/arm/gnunet-service-arm.c:1506 |
338 | #, c-format | 338 | #, c-format |
339 | msgid "Default service `%s' not configured correctly!\n" | 339 | msgid "Default service `%s' not configured correctly!\n" |
340 | msgstr "" | 340 | msgstr "" |
341 | 341 | ||
342 | #: src/arm/gnunet-service-arm.c:1509 | 342 | #: src/arm/gnunet-service-arm.c:1519 |
343 | msgid "" | 343 | msgid "" |
344 | "No default services configured, GNUnet will not really start right now.\n" | 344 | "No default services configured, GNUnet will not really start right now.\n" |
345 | msgstr "" | 345 | msgstr "" |
@@ -7,7 +7,7 @@ msgid "" | |||
7 | msgstr "" | 7 | msgstr "" |
8 | "Project-Id-Version: gnunet 0.9.5a\n" | 8 | "Project-Id-Version: gnunet 0.9.5a\n" |
9 | "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" | 9 | "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" |
10 | "POT-Creation-Date: 2013-12-23 22:54+0100\n" | 10 | "POT-Creation-Date: 2013-12-23 23:34+0100\n" |
11 | "PO-Revision-Date: 2013-02-23 17:50+0100\n" | 11 | "PO-Revision-Date: 2013-02-23 17:50+0100\n" |
12 | "Last-Translator: Miguel Ángel Arruga Vivas <rosen644835@gmail.com>\n" | 12 | "Last-Translator: Miguel Ángel Arruga Vivas <rosen644835@gmail.com>\n" |
13 | "Language-Team: Spanish <es@li.org>\n" | 13 | "Language-Team: Spanish <es@li.org>\n" |
@@ -17,7 +17,7 @@ msgstr "" | |||
17 | "Content-Transfer-Encoding: 8bit\n" | 17 | "Content-Transfer-Encoding: 8bit\n" |
18 | "Plural-Forms: nplurals=2; plural=(n != 1);\n" | 18 | "Plural-Forms: nplurals=2; plural=(n != 1);\n" |
19 | 19 | ||
20 | #: src/arm/arm_api.c:336 | 20 | #: src/arm/arm_api.c:337 |
21 | #, fuzzy | 21 | #, fuzzy |
22 | msgid "Client was disconnected from arm service, trying to reconnect.\n" | 22 | msgid "Client was disconnected from arm service, trying to reconnect.\n" |
23 | msgstr "" | 23 | msgstr "" |
@@ -278,23 +278,23 @@ msgstr "No se pudo mandar el resultado (estado) al cliente\n" | |||
278 | msgid "Could not send list result to client\n" | 278 | msgid "Could not send list result to client\n" |
279 | msgstr "No se pudo mandar el resultado (lista) al cliente\n" | 279 | msgstr "No se pudo mandar el resultado (lista) al cliente\n" |
280 | 280 | ||
281 | #: src/arm/gnunet-service-arm.c:528 | 281 | #: src/arm/gnunet-service-arm.c:529 |
282 | #, c-format | 282 | #, c-format |
283 | msgid "Failed to start service `%s'\n" | 283 | msgid "Failed to start service `%s'\n" |
284 | msgstr "Se produjo un fallo al iniciar el servicio «%s»\n" | 284 | msgstr "Se produjo un fallo al iniciar el servicio «%s»\n" |
285 | 285 | ||
286 | #: src/arm/gnunet-service-arm.c:535 | 286 | #: src/arm/gnunet-service-arm.c:540 |
287 | #, c-format | 287 | #, c-format |
288 | msgid "Starting service `%s'\n" | 288 | msgid "Starting service `%s'\n" |
289 | msgstr "Iniciando el servicio «%s»\n" | 289 | msgstr "Iniciando el servicio «%s»\n" |
290 | 290 | ||
291 | # Miguel: ¿Alguna idea para "socket"? | 291 | # Miguel: ¿Alguna idea para "socket"? |
292 | #: src/arm/gnunet-service-arm.c:634 | 292 | #: src/arm/gnunet-service-arm.c:639 |
293 | #, c-format | 293 | #, c-format |
294 | msgid "Unable to create socket for service `%s': %s\n" | 294 | msgid "Unable to create socket for service `%s': %s\n" |
295 | msgstr "Imposible crear un «socket» para el servicio «%s»: %s\n" | 295 | msgstr "Imposible crear un «socket» para el servicio «%s»: %s\n" |
296 | 296 | ||
297 | #: src/arm/gnunet-service-arm.c:656 | 297 | #: src/arm/gnunet-service-arm.c:661 |
298 | #, c-format | 298 | #, c-format |
299 | msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n" | 299 | msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n" |
300 | msgstr "" | 300 | msgstr "" |
@@ -305,49 +305,49 @@ msgstr "" | |||
305 | # no es exactamente lo mismo que el texto en inglés, pero | 305 | # no es exactamente lo mismo que el texto en inglés, pero |
306 | # es fiel a la realidad puesto que el ARM reinicia | 306 | # es fiel a la realidad puesto que el ARM reinicia |
307 | # las conexiones cuando se caen. | 307 | # las conexiones cuando se caen. |
308 | #: src/arm/gnunet-service-arm.c:685 | 308 | #: src/arm/gnunet-service-arm.c:690 |
309 | #, c-format | 309 | #, c-format |
310 | msgid "ARM now monitors connections to service `%s' at `%s'\n" | 310 | msgid "ARM now monitors connections to service `%s' at `%s'\n" |
311 | msgstr "El ARM ahora gestiona las conexiones del servicio «%s» en «%s»\n" | 311 | msgstr "El ARM ahora gestiona las conexiones del servicio «%s» en «%s»\n" |
312 | 312 | ||
313 | #: src/arm/gnunet-service-arm.c:821 | 313 | #: src/arm/gnunet-service-arm.c:826 |
314 | #, c-format | 314 | #, c-format |
315 | msgid "Preparing to stop `%s'\n" | 315 | msgid "Preparing to stop `%s'\n" |
316 | msgstr "Preparando para parar «%s»\n" | 316 | msgstr "Preparando para parar «%s»\n" |
317 | 317 | ||
318 | #: src/arm/gnunet-service-arm.c:1085 | 318 | #: src/arm/gnunet-service-arm.c:1095 |
319 | #, c-format | 319 | #, c-format |
320 | msgid "Restarting service `%s'.\n" | 320 | msgid "Restarting service `%s'.\n" |
321 | msgstr "Reiniciando el servicio «%s»\n" | 321 | msgstr "Reiniciando el servicio «%s»\n" |
322 | 322 | ||
323 | #: src/arm/gnunet-service-arm.c:1178 | 323 | #: src/arm/gnunet-service-arm.c:1188 |
324 | msgid "exit" | 324 | msgid "exit" |
325 | msgstr "salida" | 325 | msgstr "salida" |
326 | 326 | ||
327 | #: src/arm/gnunet-service-arm.c:1183 | 327 | #: src/arm/gnunet-service-arm.c:1193 |
328 | msgid "signal" | 328 | msgid "signal" |
329 | msgstr "señal" | 329 | msgstr "señal" |
330 | 330 | ||
331 | #: src/arm/gnunet-service-arm.c:1188 | 331 | #: src/arm/gnunet-service-arm.c:1198 |
332 | msgid "unknown" | 332 | msgid "unknown" |
333 | msgstr "desconocido" | 333 | msgstr "desconocido" |
334 | 334 | ||
335 | #: src/arm/gnunet-service-arm.c:1194 | 335 | #: src/arm/gnunet-service-arm.c:1204 |
336 | #, c-format | 336 | #, c-format |
337 | msgid "Service `%s' took %s to terminate\n" | 337 | msgid "Service `%s' took %s to terminate\n" |
338 | msgstr "El servicio «%s» tardó %s en finalizar\n" | 338 | msgstr "El servicio «%s» tardó %s en finalizar\n" |
339 | 339 | ||
340 | #: src/arm/gnunet-service-arm.c:1216 | 340 | #: src/arm/gnunet-service-arm.c:1226 |
341 | #, fuzzy, c-format | 341 | #, fuzzy, c-format |
342 | msgid "Service `%s' terminated normally, will restart at any time\n" | 342 | msgid "Service `%s' terminated normally, will restart at any time\n" |
343 | msgstr "El servicio «%s» finalizó con estado %s/%d, se reiniciará en %llu ms\n" | 343 | msgstr "El servicio «%s» finalizó con estado %s/%d, se reiniciará en %llu ms\n" |
344 | 344 | ||
345 | #: src/arm/gnunet-service-arm.c:1231 | 345 | #: src/arm/gnunet-service-arm.c:1241 |
346 | #, fuzzy, c-format | 346 | #, fuzzy, c-format |
347 | msgid "Service `%s' terminated with status %s/%d, will restart in %s\n" | 347 | msgid "Service `%s' terminated with status %s/%d, will restart in %s\n" |
348 | msgstr "El servicio «%s» finalizó con estado %s/%d, se reiniciará en %llu ms\n" | 348 | msgstr "El servicio «%s» finalizó con estado %s/%d, se reiniciará en %llu ms\n" |
349 | 349 | ||
350 | #: src/arm/gnunet-service-arm.c:1484 | 350 | #: src/arm/gnunet-service-arm.c:1495 |
351 | #, c-format | 351 | #, c-format |
352 | msgid "Starting default services `%s'\n" | 352 | msgid "Starting default services `%s'\n" |
353 | msgstr "Iniciando servicios predeterminados «%s»\n" | 353 | msgstr "Iniciando servicios predeterminados «%s»\n" |
@@ -355,13 +355,13 @@ msgstr "Iniciando servicios predeterminados «%s»\n" | |||
355 | # Miguel: He traducido "default" por "predeterminado", la locución | 355 | # Miguel: He traducido "default" por "predeterminado", la locución |
356 | # "por defecto" no tiene sentido en sitios como este y he tratado | 356 | # "por defecto" no tiene sentido en sitios como este y he tratado |
357 | # de ser consistente. | 357 | # de ser consistente. |
358 | #: src/arm/gnunet-service-arm.c:1495 | 358 | #: src/arm/gnunet-service-arm.c:1506 |
359 | #, c-format | 359 | #, c-format |
360 | msgid "Default service `%s' not configured correctly!\n" | 360 | msgid "Default service `%s' not configured correctly!\n" |
361 | msgstr "¡El servicio predeterminado «%s» no está configurado correctamente!\n" | 361 | msgstr "¡El servicio predeterminado «%s» no está configurado correctamente!\n" |
362 | 362 | ||
363 | # Miguel: ¿No hay servicios -> no hay ningún servicio? | 363 | # Miguel: ¿No hay servicios -> no hay ningún servicio? |
364 | #: src/arm/gnunet-service-arm.c:1509 | 364 | #: src/arm/gnunet-service-arm.c:1519 |
365 | msgid "" | 365 | msgid "" |
366 | "No default services configured, GNUnet will not really start right now.\n" | 366 | "No default services configured, GNUnet will not really start right now.\n" |
367 | msgstr "" | 367 | msgstr "" |
@@ -7,7 +7,7 @@ msgid "" | |||
7 | msgstr "" | 7 | msgstr "" |
8 | "Project-Id-Version: GNUnet 0.7.0b\n" | 8 | "Project-Id-Version: GNUnet 0.7.0b\n" |
9 | "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" | 9 | "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" |
10 | "POT-Creation-Date: 2013-12-23 22:54+0100\n" | 10 | "POT-Creation-Date: 2013-12-23 23:34+0100\n" |
11 | "PO-Revision-Date: 2006-01-21 17:16+0100\n" | 11 | "PO-Revision-Date: 2006-01-21 17:16+0100\n" |
12 | "Last-Translator: Daniel Nylander <po@danielnylander.se>\n" | 12 | "Last-Translator: Daniel Nylander <po@danielnylander.se>\n" |
13 | "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" | 13 | "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" |
@@ -16,7 +16,7 @@ msgstr "" | |||
16 | "Content-Type: text/plain; charset=UTF-8\n" | 16 | "Content-Type: text/plain; charset=UTF-8\n" |
17 | "Content-Transfer-Encoding: 8bit\n" | 17 | "Content-Transfer-Encoding: 8bit\n" |
18 | 18 | ||
19 | #: src/arm/arm_api.c:336 | 19 | #: src/arm/arm_api.c:337 |
20 | msgid "Client was disconnected from arm service, trying to reconnect.\n" | 20 | msgid "Client was disconnected from arm service, trying to reconnect.\n" |
21 | msgstr "" | 21 | msgstr "" |
22 | 22 | ||
@@ -264,80 +264,80 @@ msgstr "Kunde inte skicka begäran till gnunetd.\n" | |||
264 | msgid "Could not send list result to client\n" | 264 | msgid "Could not send list result to client\n" |
265 | msgstr "Kunde inte skicka begäran till gnunetd.\n" | 265 | msgstr "Kunde inte skicka begäran till gnunetd.\n" |
266 | 266 | ||
267 | #: src/arm/gnunet-service-arm.c:528 | 267 | #: src/arm/gnunet-service-arm.c:529 |
268 | #, fuzzy, c-format | 268 | #, fuzzy, c-format |
269 | msgid "Failed to start service `%s'\n" | 269 | msgid "Failed to start service `%s'\n" |
270 | msgstr "Misslyckades att starta samling.\n" | 270 | msgstr "Misslyckades att starta samling.\n" |
271 | 271 | ||
272 | #: src/arm/gnunet-service-arm.c:535 | 272 | #: src/arm/gnunet-service-arm.c:540 |
273 | #, fuzzy, c-format | 273 | #, fuzzy, c-format |
274 | msgid "Starting service `%s'\n" | 274 | msgid "Starting service `%s'\n" |
275 | msgstr "Startade samling \"%s\".\n" | 275 | msgstr "Startade samling \"%s\".\n" |
276 | 276 | ||
277 | #: src/arm/gnunet-service-arm.c:634 | 277 | #: src/arm/gnunet-service-arm.c:639 |
278 | #, fuzzy, c-format | 278 | #, fuzzy, c-format |
279 | msgid "Unable to create socket for service `%s': %s\n" | 279 | msgid "Unable to create socket for service `%s': %s\n" |
280 | msgstr "Kunde inte skapa användarkonto:" | 280 | msgstr "Kunde inte skapa användarkonto:" |
281 | 281 | ||
282 | #: src/arm/gnunet-service-arm.c:656 | 282 | #: src/arm/gnunet-service-arm.c:661 |
283 | #, c-format | 283 | #, c-format |
284 | msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n" | 284 | msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n" |
285 | msgstr "" | 285 | msgstr "" |
286 | 286 | ||
287 | #: src/arm/gnunet-service-arm.c:685 | 287 | #: src/arm/gnunet-service-arm.c:690 |
288 | #, c-format | 288 | #, c-format |
289 | msgid "ARM now monitors connections to service `%s' at `%s'\n" | 289 | msgid "ARM now monitors connections to service `%s' at `%s'\n" |
290 | msgstr "" | 290 | msgstr "" |
291 | 291 | ||
292 | #: src/arm/gnunet-service-arm.c:821 | 292 | #: src/arm/gnunet-service-arm.c:826 |
293 | #, fuzzy, c-format | 293 | #, fuzzy, c-format |
294 | msgid "Preparing to stop `%s'\n" | 294 | msgid "Preparing to stop `%s'\n" |
295 | msgstr "Startade samling \"%s\".\n" | 295 | msgstr "Startade samling \"%s\".\n" |
296 | 296 | ||
297 | #: src/arm/gnunet-service-arm.c:1085 | 297 | #: src/arm/gnunet-service-arm.c:1095 |
298 | #, fuzzy, c-format | 298 | #, fuzzy, c-format |
299 | msgid "Restarting service `%s'.\n" | 299 | msgid "Restarting service `%s'.\n" |
300 | msgstr "Startade samling \"%s\".\n" | 300 | msgstr "Startade samling \"%s\".\n" |
301 | 301 | ||
302 | #: src/arm/gnunet-service-arm.c:1178 | 302 | #: src/arm/gnunet-service-arm.c:1188 |
303 | msgid "exit" | 303 | msgid "exit" |
304 | msgstr "" | 304 | msgstr "" |
305 | 305 | ||
306 | #: src/arm/gnunet-service-arm.c:1183 | 306 | #: src/arm/gnunet-service-arm.c:1193 |
307 | msgid "signal" | 307 | msgid "signal" |
308 | msgstr "" | 308 | msgstr "" |
309 | 309 | ||
310 | #: src/arm/gnunet-service-arm.c:1188 | 310 | #: src/arm/gnunet-service-arm.c:1198 |
311 | #, fuzzy | 311 | #, fuzzy |
312 | msgid "unknown" | 312 | msgid "unknown" |
313 | msgstr "Okänt fel" | 313 | msgstr "Okänt fel" |
314 | 314 | ||
315 | #: src/arm/gnunet-service-arm.c:1194 | 315 | #: src/arm/gnunet-service-arm.c:1204 |
316 | #, fuzzy, c-format | 316 | #, fuzzy, c-format |
317 | msgid "Service `%s' took %s to terminate\n" | 317 | msgid "Service `%s' took %s to terminate\n" |
318 | msgstr "Tjänst borttagen.\n" | 318 | msgstr "Tjänst borttagen.\n" |
319 | 319 | ||
320 | #: src/arm/gnunet-service-arm.c:1216 | 320 | #: src/arm/gnunet-service-arm.c:1226 |
321 | #, c-format | 321 | #, c-format |
322 | msgid "Service `%s' terminated normally, will restart at any time\n" | 322 | msgid "Service `%s' terminated normally, will restart at any time\n" |
323 | msgstr "" | 323 | msgstr "" |
324 | 324 | ||
325 | #: src/arm/gnunet-service-arm.c:1231 | 325 | #: src/arm/gnunet-service-arm.c:1241 |
326 | #, c-format | 326 | #, c-format |
327 | msgid "Service `%s' terminated with status %s/%d, will restart in %s\n" | 327 | msgid "Service `%s' terminated with status %s/%d, will restart in %s\n" |
328 | msgstr "" | 328 | msgstr "" |
329 | 329 | ||
330 | #: src/arm/gnunet-service-arm.c:1484 | 330 | #: src/arm/gnunet-service-arm.c:1495 |
331 | #, fuzzy, c-format | 331 | #, fuzzy, c-format |
332 | msgid "Starting default services `%s'\n" | 332 | msgid "Starting default services `%s'\n" |
333 | msgstr "Startade samling \"%s\".\n" | 333 | msgstr "Startade samling \"%s\".\n" |
334 | 334 | ||
335 | #: src/arm/gnunet-service-arm.c:1495 | 335 | #: src/arm/gnunet-service-arm.c:1506 |
336 | #, c-format | 336 | #, c-format |
337 | msgid "Default service `%s' not configured correctly!\n" | 337 | msgid "Default service `%s' not configured correctly!\n" |
338 | msgstr "" | 338 | msgstr "" |
339 | 339 | ||
340 | #: src/arm/gnunet-service-arm.c:1509 | 340 | #: src/arm/gnunet-service-arm.c:1519 |
341 | msgid "" | 341 | msgid "" |
342 | "No default services configured, GNUnet will not really start right now.\n" | 342 | "No default services configured, GNUnet will not really start right now.\n" |
343 | msgstr "" | 343 | msgstr "" |
@@ -8,7 +8,7 @@ msgid "" | |||
8 | msgstr "" | 8 | msgstr "" |
9 | "Project-Id-Version: gnunet 0.8.0a\n" | 9 | "Project-Id-Version: gnunet 0.8.0a\n" |
10 | "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" | 10 | "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" |
11 | "POT-Creation-Date: 2013-12-23 22:54+0100\n" | 11 | "POT-Creation-Date: 2013-12-23 23:34+0100\n" |
12 | "PO-Revision-Date: 2008-09-10 22:05+0930\n" | 12 | "PO-Revision-Date: 2008-09-10 22:05+0930\n" |
13 | "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" | 13 | "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" |
14 | "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n" | 14 | "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n" |
@@ -19,7 +19,7 @@ msgstr "" | |||
19 | "Plural-Forms: nplurals=1; plural=0;\n" | 19 | "Plural-Forms: nplurals=1; plural=0;\n" |
20 | "X-Generator: LocFactoryEditor 1.7b3\n" | 20 | "X-Generator: LocFactoryEditor 1.7b3\n" |
21 | 21 | ||
22 | #: src/arm/arm_api.c:336 | 22 | #: src/arm/arm_api.c:337 |
23 | msgid "Client was disconnected from arm service, trying to reconnect.\n" | 23 | msgid "Client was disconnected from arm service, trying to reconnect.\n" |
24 | msgstr "" | 24 | msgstr "" |
25 | 25 | ||
@@ -270,80 +270,80 @@ msgstr "" | |||
270 | msgid "Could not send list result to client\n" | 270 | msgid "Could not send list result to client\n" |
271 | msgstr "Không thể đọc danh sách bạn bè « %s »\n" | 271 | msgstr "Không thể đọc danh sách bạn bè « %s »\n" |
272 | 272 | ||
273 | #: src/arm/gnunet-service-arm.c:528 | 273 | #: src/arm/gnunet-service-arm.c:529 |
274 | #, fuzzy, c-format | 274 | #, fuzzy, c-format |
275 | msgid "Failed to start service `%s'\n" | 275 | msgid "Failed to start service `%s'\n" |
276 | msgstr "Lỗi bắt đầu thu thập.\n" | 276 | msgstr "Lỗi bắt đầu thu thập.\n" |
277 | 277 | ||
278 | #: src/arm/gnunet-service-arm.c:535 | 278 | #: src/arm/gnunet-service-arm.c:540 |
279 | #, fuzzy, c-format | 279 | #, fuzzy, c-format |
280 | msgid "Starting service `%s'\n" | 280 | msgid "Starting service `%s'\n" |
281 | msgstr "Đang bắt đầu tài về « %s »\n" | 281 | msgstr "Đang bắt đầu tài về « %s »\n" |
282 | 282 | ||
283 | #: src/arm/gnunet-service-arm.c:634 | 283 | #: src/arm/gnunet-service-arm.c:639 |
284 | #, fuzzy, c-format | 284 | #, fuzzy, c-format |
285 | msgid "Unable to create socket for service `%s': %s\n" | 285 | msgid "Unable to create socket for service `%s': %s\n" |
286 | msgstr "Không thể tạo tài khoản người dùng:" | 286 | msgstr "Không thể tạo tài khoản người dùng:" |
287 | 287 | ||
288 | #: src/arm/gnunet-service-arm.c:656 | 288 | #: src/arm/gnunet-service-arm.c:661 |
289 | #, c-format | 289 | #, c-format |
290 | msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n" | 290 | msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n" |
291 | msgstr "" | 291 | msgstr "" |
292 | 292 | ||
293 | #: src/arm/gnunet-service-arm.c:685 | 293 | #: src/arm/gnunet-service-arm.c:690 |
294 | #, c-format | 294 | #, c-format |
295 | msgid "ARM now monitors connections to service `%s' at `%s'\n" | 295 | msgid "ARM now monitors connections to service `%s' at `%s'\n" |
296 | msgstr "" | 296 | msgstr "" |
297 | 297 | ||
298 | #: src/arm/gnunet-service-arm.c:821 | 298 | #: src/arm/gnunet-service-arm.c:826 |
299 | #, fuzzy, c-format | 299 | #, fuzzy, c-format |
300 | msgid "Preparing to stop `%s'\n" | 300 | msgid "Preparing to stop `%s'\n" |
301 | msgstr "Đang bắt đầu tài lên « %s ».\n" | 301 | msgstr "Đang bắt đầu tài lên « %s ».\n" |
302 | 302 | ||
303 | #: src/arm/gnunet-service-arm.c:1085 | 303 | #: src/arm/gnunet-service-arm.c:1095 |
304 | #, fuzzy, c-format | 304 | #, fuzzy, c-format |
305 | msgid "Restarting service `%s'.\n" | 305 | msgid "Restarting service `%s'.\n" |
306 | msgstr "Đang nạp và khởi động dùng « %s ».\n" | 306 | msgstr "Đang nạp và khởi động dùng « %s ».\n" |
307 | 307 | ||
308 | #: src/arm/gnunet-service-arm.c:1178 | 308 | #: src/arm/gnunet-service-arm.c:1188 |
309 | msgid "exit" | 309 | msgid "exit" |
310 | msgstr "" | 310 | msgstr "" |
311 | 311 | ||
312 | #: src/arm/gnunet-service-arm.c:1183 | 312 | #: src/arm/gnunet-service-arm.c:1193 |
313 | msgid "signal" | 313 | msgid "signal" |
314 | msgstr "" | 314 | msgstr "" |
315 | 315 | ||
316 | #: src/arm/gnunet-service-arm.c:1188 | 316 | #: src/arm/gnunet-service-arm.c:1198 |
317 | #, fuzzy | 317 | #, fuzzy |
318 | msgid "unknown" | 318 | msgid "unknown" |
319 | msgstr "Lỗi không rõ" | 319 | msgstr "Lỗi không rõ" |
320 | 320 | ||
321 | #: src/arm/gnunet-service-arm.c:1194 | 321 | #: src/arm/gnunet-service-arm.c:1204 |
322 | #, fuzzy, c-format | 322 | #, fuzzy, c-format |
323 | msgid "Service `%s' took %s to terminate\n" | 323 | msgid "Service `%s' took %s to terminate\n" |
324 | msgstr "Dịch vụ đã bị xoá.\n" | 324 | msgstr "Dịch vụ đã bị xoá.\n" |
325 | 325 | ||
326 | #: src/arm/gnunet-service-arm.c:1216 | 326 | #: src/arm/gnunet-service-arm.c:1226 |
327 | #, c-format | 327 | #, c-format |
328 | msgid "Service `%s' terminated normally, will restart at any time\n" | 328 | msgid "Service `%s' terminated normally, will restart at any time\n" |
329 | msgstr "" | 329 | msgstr "" |
330 | 330 | ||
331 | #: src/arm/gnunet-service-arm.c:1231 | 331 | #: src/arm/gnunet-service-arm.c:1241 |
332 | #, c-format | 332 | #, c-format |
333 | msgid "Service `%s' terminated with status %s/%d, will restart in %s\n" | 333 | msgid "Service `%s' terminated with status %s/%d, will restart in %s\n" |
334 | msgstr "" | 334 | msgstr "" |
335 | 335 | ||
336 | #: src/arm/gnunet-service-arm.c:1484 | 336 | #: src/arm/gnunet-service-arm.c:1495 |
337 | #, fuzzy, c-format | 337 | #, fuzzy, c-format |
338 | msgid "Starting default services `%s'\n" | 338 | msgid "Starting default services `%s'\n" |
339 | msgstr "Đang bắt đầu tài về « %s »\n" | 339 | msgstr "Đang bắt đầu tài về « %s »\n" |
340 | 340 | ||
341 | #: src/arm/gnunet-service-arm.c:1495 | 341 | #: src/arm/gnunet-service-arm.c:1506 |
342 | #, c-format | 342 | #, c-format |
343 | msgid "Default service `%s' not configured correctly!\n" | 343 | msgid "Default service `%s' not configured correctly!\n" |
344 | msgstr "" | 344 | msgstr "" |
345 | 345 | ||
346 | #: src/arm/gnunet-service-arm.c:1509 | 346 | #: src/arm/gnunet-service-arm.c:1519 |
347 | msgid "" | 347 | msgid "" |
348 | "No default services configured, GNUnet will not really start right now.\n" | 348 | "No default services configured, GNUnet will not really start right now.\n" |
349 | msgstr "" | 349 | msgstr "" |
diff --git a/po/zh_CN.po b/po/zh_CN.po index 4b9ae77f0..a1d067caa 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po | |||
@@ -7,7 +7,7 @@ msgid "" | |||
7 | msgstr "" | 7 | msgstr "" |
8 | "Project-Id-Version: gnunet-0.8.1\n" | 8 | "Project-Id-Version: gnunet-0.8.1\n" |
9 | "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" | 9 | "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" |
10 | "POT-Creation-Date: 2013-12-23 22:54+0100\n" | 10 | "POT-Creation-Date: 2013-12-23 23:34+0100\n" |
11 | "PO-Revision-Date: 2011-07-09 12:12+0800\n" | 11 | "PO-Revision-Date: 2011-07-09 12:12+0800\n" |
12 | "Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n" | 12 | "Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n" |
13 | "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n" | 13 | "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n" |
@@ -16,7 +16,7 @@ msgstr "" | |||
16 | "Content-Type: text/plain; charset=UTF-8\n" | 16 | "Content-Type: text/plain; charset=UTF-8\n" |
17 | "Content-Transfer-Encoding: 8bit\n" | 17 | "Content-Transfer-Encoding: 8bit\n" |
18 | 18 | ||
19 | #: src/arm/arm_api.c:336 | 19 | #: src/arm/arm_api.c:337 |
20 | msgid "Client was disconnected from arm service, trying to reconnect.\n" | 20 | msgid "Client was disconnected from arm service, trying to reconnect.\n" |
21 | msgstr "" | 21 | msgstr "" |
22 | 22 | ||
@@ -263,80 +263,80 @@ msgstr "" | |||
263 | msgid "Could not send list result to client\n" | 263 | msgid "Could not send list result to client\n" |
264 | msgstr "找不到接口“%s”的一个 IP 地址。\n" | 264 | msgstr "找不到接口“%s”的一个 IP 地址。\n" |
265 | 265 | ||
266 | #: src/arm/gnunet-service-arm.c:528 | 266 | #: src/arm/gnunet-service-arm.c:529 |
267 | #, fuzzy, c-format | 267 | #, fuzzy, c-format |
268 | msgid "Failed to start service `%s'\n" | 268 | msgid "Failed to start service `%s'\n" |
269 | msgstr "解析配置文件“%s”失败\n" | 269 | msgstr "解析配置文件“%s”失败\n" |
270 | 270 | ||
271 | #: src/arm/gnunet-service-arm.c:535 | 271 | #: src/arm/gnunet-service-arm.c:540 |
272 | #, c-format | 272 | #, c-format |
273 | msgid "Starting service `%s'\n" | 273 | msgid "Starting service `%s'\n" |
274 | msgstr "" | 274 | msgstr "" |
275 | 275 | ||
276 | #: src/arm/gnunet-service-arm.c:634 | 276 | #: src/arm/gnunet-service-arm.c:639 |
277 | #, fuzzy, c-format | 277 | #, fuzzy, c-format |
278 | msgid "Unable to create socket for service `%s': %s\n" | 278 | msgid "Unable to create socket for service `%s': %s\n" |
279 | msgstr "无法创建用户账户:" | 279 | msgstr "无法创建用户账户:" |
280 | 280 | ||
281 | #: src/arm/gnunet-service-arm.c:656 | 281 | #: src/arm/gnunet-service-arm.c:661 |
282 | #, c-format | 282 | #, c-format |
283 | msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n" | 283 | msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n" |
284 | msgstr "" | 284 | msgstr "" |
285 | 285 | ||
286 | #: src/arm/gnunet-service-arm.c:685 | 286 | #: src/arm/gnunet-service-arm.c:690 |
287 | #, c-format | 287 | #, c-format |
288 | msgid "ARM now monitors connections to service `%s' at `%s'\n" | 288 | msgid "ARM now monitors connections to service `%s' at `%s'\n" |
289 | msgstr "" | 289 | msgstr "" |
290 | 290 | ||
291 | #: src/arm/gnunet-service-arm.c:821 | 291 | #: src/arm/gnunet-service-arm.c:826 |
292 | #, c-format | 292 | #, c-format |
293 | msgid "Preparing to stop `%s'\n" | 293 | msgid "Preparing to stop `%s'\n" |
294 | msgstr "" | 294 | msgstr "" |
295 | 295 | ||
296 | #: src/arm/gnunet-service-arm.c:1085 | 296 | #: src/arm/gnunet-service-arm.c:1095 |
297 | #, c-format | 297 | #, c-format |
298 | msgid "Restarting service `%s'.\n" | 298 | msgid "Restarting service `%s'.\n" |
299 | msgstr "" | 299 | msgstr "" |
300 | 300 | ||
301 | #: src/arm/gnunet-service-arm.c:1178 | 301 | #: src/arm/gnunet-service-arm.c:1188 |
302 | msgid "exit" | 302 | msgid "exit" |
303 | msgstr "" | 303 | msgstr "" |
304 | 304 | ||
305 | #: src/arm/gnunet-service-arm.c:1183 | 305 | #: src/arm/gnunet-service-arm.c:1193 |
306 | msgid "signal" | 306 | msgid "signal" |
307 | msgstr "" | 307 | msgstr "" |
308 | 308 | ||
309 | #: src/arm/gnunet-service-arm.c:1188 | 309 | #: src/arm/gnunet-service-arm.c:1198 |
310 | #, fuzzy | 310 | #, fuzzy |
311 | msgid "unknown" | 311 | msgid "unknown" |
312 | msgstr "未知错误" | 312 | msgstr "未知错误" |
313 | 313 | ||
314 | #: src/arm/gnunet-service-arm.c:1194 | 314 | #: src/arm/gnunet-service-arm.c:1204 |
315 | #, fuzzy, c-format | 315 | #, fuzzy, c-format |
316 | msgid "Service `%s' took %s to terminate\n" | 316 | msgid "Service `%s' took %s to terminate\n" |
317 | msgstr "服务已删除。\n" | 317 | msgstr "服务已删除。\n" |
318 | 318 | ||
319 | #: src/arm/gnunet-service-arm.c:1216 | 319 | #: src/arm/gnunet-service-arm.c:1226 |
320 | #, c-format | 320 | #, c-format |
321 | msgid "Service `%s' terminated normally, will restart at any time\n" | 321 | msgid "Service `%s' terminated normally, will restart at any time\n" |
322 | msgstr "" | 322 | msgstr "" |
323 | 323 | ||
324 | #: src/arm/gnunet-service-arm.c:1231 | 324 | #: src/arm/gnunet-service-arm.c:1241 |
325 | #, c-format | 325 | #, c-format |
326 | msgid "Service `%s' terminated with status %s/%d, will restart in %s\n" | 326 | msgid "Service `%s' terminated with status %s/%d, will restart in %s\n" |
327 | msgstr "" | 327 | msgstr "" |
328 | 328 | ||
329 | #: src/arm/gnunet-service-arm.c:1484 | 329 | #: src/arm/gnunet-service-arm.c:1495 |
330 | #, fuzzy, c-format | 330 | #, fuzzy, c-format |
331 | msgid "Starting default services `%s'\n" | 331 | msgid "Starting default services `%s'\n" |
332 | msgstr "卸载 GNUnet 服务" | 332 | msgstr "卸载 GNUnet 服务" |
333 | 333 | ||
334 | #: src/arm/gnunet-service-arm.c:1495 | 334 | #: src/arm/gnunet-service-arm.c:1506 |
335 | #, c-format | 335 | #, c-format |
336 | msgid "Default service `%s' not configured correctly!\n" | 336 | msgid "Default service `%s' not configured correctly!\n" |
337 | msgstr "" | 337 | msgstr "" |
338 | 338 | ||
339 | #: src/arm/gnunet-service-arm.c:1509 | 339 | #: src/arm/gnunet-service-arm.c:1519 |
340 | msgid "" | 340 | msgid "" |
341 | "No default services configured, GNUnet will not really start right now.\n" | 341 | "No default services configured, GNUnet will not really start right now.\n" |
342 | msgstr "" | 342 | msgstr "" |
diff --git a/src/include/gnunet_scheduler_lib.h b/src/include/gnunet_scheduler_lib.h index 24e316b47..4da80407c 100644 --- a/src/include/gnunet_scheduler_lib.h +++ b/src/include/gnunet_scheduler_lib.h | |||
@@ -29,8 +29,6 @@ | |||
29 | #ifndef GNUNET_SCHEDULER_LIB_H | 29 | #ifndef GNUNET_SCHEDULER_LIB_H |
30 | #define GNUNET_SCHEDULER_LIB_H | 30 | #define GNUNET_SCHEDULER_LIB_H |
31 | 31 | ||
32 | #include <stdbool.h> | ||
33 | |||
34 | #ifdef __cplusplus | 32 | #ifdef __cplusplus |
35 | extern "C" | 33 | extern "C" |
36 | { | 34 | { |
@@ -476,13 +474,13 @@ GNUNET_SCHEDULER_add_write_net (struct GNUNET_TIME_Relative delay, | |||
476 | * socket operation is ready. | 474 | * socket operation is ready. |
477 | * | 475 | * |
478 | * @param delay when should this operation time out? Use | 476 | * @param delay when should this operation time out? Use |
479 | * GNUNET_TIME_UNIT_FOREVER_REL for "on shutdown" | 477 | * #GNUNET_TIME_UNIT_FOREVER_REL for "on shutdown" |
480 | * @param priority priority of the task | 478 | * @param priority priority of the task |
481 | * @param fd file-descriptor | 479 | * @param fd file-descriptor |
482 | * @param on_read whether to poll the file-descriptor for readability | 480 | * @param on_read whether to poll the file-descriptor for readability |
483 | * @param on_write whether to poll the file-descriptor for writability | 481 | * @param on_write whether to poll the file-descriptor for writability |
484 | * @param task main function of the task | 482 | * @param task main function of the task |
485 | * @param task_cls closure of task | 483 | * @param task_cls closure of @a task |
486 | * @return unique task identifier for the job | 484 | * @return unique task identifier for the job |
487 | * only valid until "task" is started! | 485 | * only valid until "task" is started! |
488 | */ | 486 | */ |
@@ -490,7 +488,7 @@ GNUNET_SCHEDULER_TaskIdentifier | |||
490 | GNUNET_SCHEDULER_add_net_with_priority (struct GNUNET_TIME_Relative delay, | 488 | GNUNET_SCHEDULER_add_net_with_priority (struct GNUNET_TIME_Relative delay, |
491 | enum GNUNET_SCHEDULER_Priority priority, | 489 | enum GNUNET_SCHEDULER_Priority priority, |
492 | struct GNUNET_NETWORK_Handle *fd, | 490 | struct GNUNET_NETWORK_Handle *fd, |
493 | bool on_read, bool on_write, | 491 | int on_read, int on_write, |
494 | GNUNET_SCHEDULER_Task task, void *task_cls); | 492 | GNUNET_SCHEDULER_Task task, void *task_cls); |
495 | 493 | ||
496 | /** | 494 | /** |
@@ -543,21 +541,21 @@ GNUNET_SCHEDULER_add_write_file (struct GNUNET_TIME_Relative delay, | |||
543 | * socket operation is ready. | 541 | * socket operation is ready. |
544 | * | 542 | * |
545 | * @param delay when should this operation time out? Use | 543 | * @param delay when should this operation time out? Use |
546 | * GNUNET_TIME_UNIT_FOREVER_REL for "on shutdown" | 544 | * #GNUNET_TIME_UNIT_FOREVER_REL for "on shutdown" |
547 | * @param priority priority of the task | 545 | * @param priority priority of the task |
548 | * @param fd file-descriptor | 546 | * @param fd file-descriptor |
549 | * @param on_read whether to poll the file-descriptor for readability | 547 | * @param on_read whether to poll the file-descriptor for readability |
550 | * @param on_write whether to poll the file-descriptor for writability | 548 | * @param on_write whether to poll the file-descriptor for writability |
551 | * @param task main function of the task | 549 | * @param task main function of the task |
552 | * @param task_cls closure of task | 550 | * @param task_cls closure of @a task |
553 | * @return unique task identifier for the job | 551 | * @return unique task identifier for the job |
554 | * only valid until "task" is started! | 552 | * only valid until @a task is started! |
555 | */ | 553 | */ |
556 | GNUNET_SCHEDULER_TaskIdentifier | 554 | GNUNET_SCHEDULER_TaskIdentifier |
557 | GNUNET_SCHEDULER_add_file_with_priority (struct GNUNET_TIME_Relative delay, | 555 | GNUNET_SCHEDULER_add_file_with_priority (struct GNUNET_TIME_Relative delay, |
558 | enum GNUNET_SCHEDULER_Priority priority, | 556 | enum GNUNET_SCHEDULER_Priority priority, |
559 | const struct GNUNET_DISK_FileHandle *fd, | 557 | const struct GNUNET_DISK_FileHandle *fd, |
560 | bool on_read, bool on_write, | 558 | int on_read, int on_write, |
561 | GNUNET_SCHEDULER_Task task, void *task_cls); | 559 | GNUNET_SCHEDULER_Task task, void *task_cls); |
562 | 560 | ||
563 | 561 | ||
diff --git a/src/util/scheduler.c b/src/util/scheduler.c index ba6a04e4f..fb81bafb7 100644 --- a/src/util/scheduler.c +++ b/src/util/scheduler.c | |||
@@ -1066,8 +1066,8 @@ GNUNET_SCHEDULER_add_continuation (GNUNET_SCHEDULER_Task task, void *task_cls, | |||
1066 | * Schedule a new task to be run with a specified priority. | 1066 | * Schedule a new task to be run with a specified priority. |
1067 | * | 1067 | * |
1068 | * @param prio how important is the new task? | 1068 | * @param prio how important is the new task? |
1069 | * @param task main function of the @a task | 1069 | * @param task main function of the task |
1070 | * @param task_cls closure of task | 1070 | * @param task_cls closure of @a task |
1071 | * @return unique task identifier for the job | 1071 | * @return unique task identifier for the job |
1072 | * only valid until @a task is started! | 1072 | * only valid until @a task is started! |
1073 | */ | 1073 | */ |
@@ -1420,7 +1420,7 @@ GNUNET_SCHEDULER_add_read_net_with_priority (struct GNUNET_TIME_Relative delay, | |||
1420 | { | 1420 | { |
1421 | return GNUNET_SCHEDULER_add_net_with_priority ( | 1421 | return GNUNET_SCHEDULER_add_net_with_priority ( |
1422 | delay, priority, | 1422 | delay, priority, |
1423 | rfd, true, false, | 1423 | rfd, GNUNET_YES, GNUNET_NO, |
1424 | task, task_cls); | 1424 | task, task_cls); |
1425 | } | 1425 | } |
1426 | 1426 | ||
@@ -1448,7 +1448,7 @@ GNUNET_SCHEDULER_add_write_net (struct GNUNET_TIME_Relative delay, | |||
1448 | { | 1448 | { |
1449 | return GNUNET_SCHEDULER_add_net_with_priority ( | 1449 | return GNUNET_SCHEDULER_add_net_with_priority ( |
1450 | delay, GNUNET_SCHEDULER_PRIORITY_DEFAULT, | 1450 | delay, GNUNET_SCHEDULER_PRIORITY_DEFAULT, |
1451 | wfd, false, true, | 1451 | wfd, GNUNET_NO, GNUNET_YES, |
1452 | task, task_cls); | 1452 | task, task_cls); |
1453 | } | 1453 | } |
1454 | 1454 | ||
@@ -1474,7 +1474,7 @@ GNUNET_SCHEDULER_TaskIdentifier | |||
1474 | GNUNET_SCHEDULER_add_net_with_priority (struct GNUNET_TIME_Relative delay, | 1474 | GNUNET_SCHEDULER_add_net_with_priority (struct GNUNET_TIME_Relative delay, |
1475 | enum GNUNET_SCHEDULER_Priority priority, | 1475 | enum GNUNET_SCHEDULER_Priority priority, |
1476 | struct GNUNET_NETWORK_Handle *fd, | 1476 | struct GNUNET_NETWORK_Handle *fd, |
1477 | bool on_read, bool on_write, | 1477 | int on_read, int on_write, |
1478 | GNUNET_SCHEDULER_Task task, void *task_cls) | 1478 | GNUNET_SCHEDULER_Task task, void *task_cls) |
1479 | { | 1479 | { |
1480 | #if MINGW | 1480 | #if MINGW |
@@ -1524,7 +1524,7 @@ GNUNET_SCHEDULER_add_read_file (struct GNUNET_TIME_Relative delay, | |||
1524 | { | 1524 | { |
1525 | return GNUNET_SCHEDULER_add_file_with_priority ( | 1525 | return GNUNET_SCHEDULER_add_file_with_priority ( |
1526 | delay, GNUNET_SCHEDULER_PRIORITY_DEFAULT, | 1526 | delay, GNUNET_SCHEDULER_PRIORITY_DEFAULT, |
1527 | rfd, true, false, | 1527 | rfd, GNUNET_YES, GNUNET_NO, |
1528 | task, task_cls); | 1528 | task, task_cls); |
1529 | } | 1529 | } |
1530 | 1530 | ||
@@ -1551,7 +1551,7 @@ GNUNET_SCHEDULER_add_write_file (struct GNUNET_TIME_Relative delay, | |||
1551 | { | 1551 | { |
1552 | return GNUNET_SCHEDULER_add_file_with_priority ( | 1552 | return GNUNET_SCHEDULER_add_file_with_priority ( |
1553 | delay, GNUNET_SCHEDULER_PRIORITY_DEFAULT, | 1553 | delay, GNUNET_SCHEDULER_PRIORITY_DEFAULT, |
1554 | wfd, false, true, | 1554 | wfd, GNUNET_NO, GNUNET_YES, |
1555 | task, task_cls); | 1555 | task, task_cls); |
1556 | } | 1556 | } |
1557 | 1557 | ||
@@ -1563,21 +1563,21 @@ GNUNET_SCHEDULER_add_write_file (struct GNUNET_TIME_Relative delay, | |||
1563 | * socket operation is ready. | 1563 | * socket operation is ready. |
1564 | * | 1564 | * |
1565 | * @param delay when should this operation time out? Use | 1565 | * @param delay when should this operation time out? Use |
1566 | * GNUNET_TIME_UNIT_FOREVER_REL for "on shutdown" | 1566 | * #GNUNET_TIME_UNIT_FOREVER_REL for "on shutdown" |
1567 | * @param priority priority of the task | 1567 | * @param priority priority of the task |
1568 | * @param fd file-descriptor | 1568 | * @param fd file-descriptor |
1569 | * @param on_read whether to poll the file-descriptor for readability | 1569 | * @param on_read whether to poll the file-descriptor for readability |
1570 | * @param on_write whether to poll the file-descriptor for writability | 1570 | * @param on_write whether to poll the file-descriptor for writability |
1571 | * @param task main function of the task | 1571 | * @param task main function of the task |
1572 | * @param task_cls closure of task | 1572 | * @param task_cls closure of @a task |
1573 | * @return unique task identifier for the job | 1573 | * @return unique task identifier for the job |
1574 | * only valid until "task" is started! | 1574 | * only valid until @a task is started! |
1575 | */ | 1575 | */ |
1576 | GNUNET_SCHEDULER_TaskIdentifier | 1576 | GNUNET_SCHEDULER_TaskIdentifier |
1577 | GNUNET_SCHEDULER_add_file_with_priority (struct GNUNET_TIME_Relative delay, | 1577 | GNUNET_SCHEDULER_add_file_with_priority (struct GNUNET_TIME_Relative delay, |
1578 | enum GNUNET_SCHEDULER_Priority priority, | 1578 | enum GNUNET_SCHEDULER_Priority priority, |
1579 | const struct GNUNET_DISK_FileHandle *fd, | 1579 | const struct GNUNET_DISK_FileHandle *fd, |
1580 | bool on_read, bool on_write, | 1580 | int on_read, int on_write, |
1581 | GNUNET_SCHEDULER_Task task, void *task_cls) | 1581 | GNUNET_SCHEDULER_Task task, void *task_cls) |
1582 | { | 1582 | { |
1583 | #if MINGW | 1583 | #if MINGW |