[GNUnet-SVN] r9139 - in gnunet/src: arm util

[gnunet]

Author: grothoff
Date: 2009-10-08 23:39:55 -0600 (Thu, 08 Oct 2009)
New Revision: 9139

Modified:
   gnunet/src/arm/test_gnunet_arm.sh
   gnunet/src/util/crypto_rsa.c
   gnunet/src/util/os_priority.c
Log:
fix

Modified: gnunet/src/arm/test_gnunet_arm.sh
===================================================================
--- gnunet/src/arm/test_gnunet_arm.sh   2009-10-09 05:37:20 UTC (rev 9138)
+++ gnunet/src/arm/test_gnunet_arm.sh   2009-10-09 05:39:55 UTC (rev 9139)
@@ -3,7 +3,7 @@
 rm -rf /tmp/test-gnunetd-arm/
 exe="./gnunet-arm -c test_arm_api_data.conf"
 base=/tmp/gnunet-test-arm
-out=`mktemp /tmp/test-gnunetd-armXXXXXX.log`
+out=`mktemp /tmp/test-gnunetd-arm-logXXXXXXXX`
 #DEBUG="-L DEBUG"
 
 
@@ -17,7 +17,7 @@
 echo "PASS"
 
 # 
----------------------------------------------------------------------------------
-echo -n "TEST: Start ARM... "
+echo -n "TEST: Start ARM..."
 
 if ! $exe $DEBUG -s > $out ; then
   echo "FAIL: error running $exe"

Modified: gnunet/src/util/crypto_rsa.c
===================================================================
--- gnunet/src/util/crypto_rsa.c        2009-10-09 05:37:20 UTC (rev 9138)
+++ gnunet/src/util/crypto_rsa.c        2009-10-09 05:39:55 UTC (rev 9139)
@@ -200,29 +200,29 @@
   size_t size;
   int rc;
 
-  rc = key_from_sexp (skey, hostkey->sexp, "public-key", "ne");
+  rc = key_from_sexp (skey, priv->sexp, "public-key", "ne");
   if (rc)
-    rc = key_from_sexp (skey, hostkey->sexp, "private-key", "ne");
+    rc = key_from_sexp (skey, priv->sexp, "private-key", "ne");
   if (rc)
-    rc = key_from_sexp (skey, hostkey->sexp, "rsa", "ne");
+    rc = key_from_sexp (skey, priv->sexp, "rsa", "ne");
   GNUNET_assert (0 == rc);
-  result->len =
+  pub->len =
     htons (sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded) -
-           sizeof (result->padding));
-  result->sizen = htons (GNUNET_CRYPTO_RSA_DATA_ENCODING_LENGTH);
-  result->padding = 0;
+           sizeof (pub->padding));
+  pub->sizen = htons (GNUNET_CRYPTO_RSA_DATA_ENCODING_LENGTH);
+  pub->padding = 0;
   size = GNUNET_CRYPTO_RSA_DATA_ENCODING_LENGTH;
   GNUNET_assert (0 == gcry_mpi_print (GCRYMPI_FMT_USG,
-                                      &result->key[0], size, &size, skey[0]));
-  adjust (&result->key[0], size, GNUNET_CRYPTO_RSA_DATA_ENCODING_LENGTH);
+                                      &pub->key[0], size, &size, skey[0]));
+  adjust (&pub->key[0], size, GNUNET_CRYPTO_RSA_DATA_ENCODING_LENGTH);
   size =
     GNUNET_CRYPTO_RSA_KEY_LENGTH - GNUNET_CRYPTO_RSA_DATA_ENCODING_LENGTH;
   GNUNET_assert (0 ==
                  gcry_mpi_print (GCRYMPI_FMT_USG,
-                                 &result->key
+                                 &pub->key
                                  [GNUNET_CRYPTO_RSA_DATA_ENCODING_LENGTH],
                                  size, &size, skey[1]));
-  adjust (&result->key[GNUNET_CRYPTO_RSA_DATA_ENCODING_LENGTH], size,
+  adjust (&pub->key[GNUNET_CRYPTO_RSA_DATA_ENCODING_LENGTH], size,
           GNUNET_CRYPTO_RSA_KEY_LENGTH -
           GNUNET_CRYPTO_RSA_DATA_ENCODING_LENGTH);
   gcry_mpi_release (skey[0]);

Modified: gnunet/src/util/os_priority.c
===================================================================
--- gnunet/src/util/os_priority.c       2009-10-09 05:37:20 UTC (rev 9138)
+++ gnunet/src/util/os_priority.c       2009-10-09 05:39:55 UTC (rev 9139)
@@ -39,7 +39,7 @@
 GNUNET_OS_set_process_priority (pid_t proc,
                                 enum GNUNET_SCHEDULER_Priority prio)
 {
-  int prio = 0;
+  int rprio = 0;
 
   GNUNET_assert (prio < GNUNET_SCHEDULER_PRIORITY_COUNT);
   if (prio == GNUNET_SCHEDULER_PRIORITY_KEEP)
@@ -49,38 +49,38 @@
     {
     case GNUNET_SCHEDULER_PRIORITY_DEFAULT:
 #ifdef MINGW
-      prio = NORMAL_PRIORITY_CLASS;
+      rprio = NORMAL_PRIORITY_CLASS;
 #else
-      prio = 0;
+      rprio = 0;
 #endif
       break;
     case GNUNET_SCHEDULER_PRIORITY_HIGH:
 #ifdef MINGW
-      prio = ABOVE_NORMAL_PRIORITY_CLASS;
+      rprio = ABOVE_NORMAL_PRIORITY_CLASS;
 #else
-      prio = -5;
+      rprio = -5;
 #endif
       break;
     case GNUNET_SCHEDULER_PRIORITY_BACKGROUND:
 #ifdef MINGW
-      prio = BELOW_NORMAL_PRIORITY_CLASS;
+      rprio = BELOW_NORMAL_PRIORITY_CLASS;
 #else
-      prio = 10;
+      rprio = 10;
 #endif
       break;
     case GNUNET_SCHEDULER_PRIORITY_UI:
     case GNUNET_SCHEDULER_PRIORITY_URGENT:
 #ifdef MINGW
-      prio = HIGH_PRIORITY_CLASS;
+      rprio = HIGH_PRIORITY_CLASS;
 #else
-      prio = -10;
+      rprio = -10;
 #endif
       break;
     case GNUNET_SCHEDULER_PRIORITY_IDLE:
 #ifdef MINGW
-      prio = IDLE_PRIORITY_CLASS;
+      rprio = IDLE_PRIORITY_CLASS;
 #else
-      prio = 19;
+      rprio = 19;
 #endif
       break;
     default:
@@ -89,12 +89,12 @@
     }
   /* Set process priority */
 #ifdef MINGW
-  SetPriorityClass (GetCurrentProcess (), prio);
+  SetPriorityClass (GetCurrentProcess (), rprio);
 #else
   if (proc == getpid ())
     {
       errno = 0;
-      if ((-1 == nice (prio)) && (errno != 0))
+      if ((-1 == nice (rprio)) && (errno != 0))
         {
           GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING |
                                GNUNET_ERROR_TYPE_BULK, "nice");
@@ -103,7 +103,7 @@
     }
   else
     {
-      if (0 != setpriority (PRIO_PROCESS, proc, prio))
+      if (0 != setpriority (PRIO_PROCESS, proc, rprio))
 
         {
           GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING |