Changeset 9574 for lang/perl

Timestamp:

04/16/08 18:38:45 (5 years ago)

Author:

daisuke

Message:

lang/perl/Crypt-DH-GMP; cleanup calls by introducing another macro

Files:

• lang/perl/Crypt-DH-GMP/trunk/GMP.xs (modified) (8 diffs)

lang/perl/Crypt-DH-GMP/trunk/GMP.xs

@@ -13 +13 @@
 #define DH_PRIVKEY(x) *((x)->priv_key)
 #define DH_PUBKEY(x)  *((x)->pub_key)
+
+#define DH_G_PTR(x)       (x)->g
+#define DH_P_PTR(x)       (x)->p
+#define DH_PRIVKEY_PTR(x) (x)->priv_key
+#define DH_PUBKEY_PTR(x)  (x)->pub_key
 
 static
@@ -57 +62 @@
     CODE:
         Newxz(dh, 1, DH_gmp_t);
-        Newxz(dh->p, 1, mpz_t);
-        Newxz(dh->g, 1, mpz_t);
-        Newxz(dh->priv_key, 1, mpz_t);
-        Newxz(dh->pub_key, 1, mpz_t);
+        Newxz(DH_P_PTR(dh),       1, mpz_t);
+        Newxz(DH_G_PTR(dh),       1, mpz_t);
+        Newxz(DH_PRIVKEY_PTR(dh), 1, mpz_t);
+        Newxz(DH_PUBKEY_PTR(dh),  1, mpz_t);
 
         mpz_init(DH_PUBKEY(dh));
@@ -86 +91 @@
             mpz_sub_ui(max, DH_P(dh), 1);
             do {
-                DH_mpz_rand_set(&(DH_PRIVKEY(dh)), mpz_sizeinbase(DH_P(dh), 2));
+                DH_mpz_rand_set(DH_PRIVKEY_PTR(dh), mpz_sizeinbase(DH_P(dh), 2));
             } while ( mpz_cmp(DH_PRIVKEY(dh), max) > 0 );
         }
@@ -113 +118 @@
         DH_gmp_t *dh;
     CODE:
-        RETVAL = DH_mpz2sv_str(&( DH_PRIVKEY(dh) ));
+        RETVAL = DH_mpz2sv_str(DH_PRIVKEY_PTR(dh));
     OUTPUT:
         RETVAL
@@ -121 +126 @@
         DH_gmp_t *dh;
     CODE:
-        RETVAL = DH_mpz2sv_str(&( DH_PUBKEY(dh) ));
+        RETVAL = DH_mpz2sv_str(DH_PUBKEY_PTR(dh));
     OUTPUT:
         RETVAL
@@ -131 +136 @@
         STRLEN n_a;
     CODE:
-        RETVAL = DH_mpz2sv_str(&( DH_G(dh) ));
+        RETVAL = DH_mpz2sv_str(DH_G_PTR(dh));
         if (items > 1) {
             mpz_init_set_str( DH_G(dh), (char *) SvPV(ST(1), n_a), 0 );
@@ -144 +149 @@
         STRLEN n_a;
     CODE:
-        RETVAL = DH_mpz2sv_str(&( DH_P(dh) ));
+        RETVAL = DH_mpz2sv_str(DH_P_PTR(dh));
         if (items > 1) {
             mpz_init_set_str( DH_P(dh), (char *) SvPV(ST(1), n_a), 0 );
@@ -160 +165 @@
         mpz_clear(DH_PRIVKEY(dh));
 
-        Safefree(dh->p);
-        Safefree(dh->g);
-        Safefree(dh->priv_key);
-        Safefree(dh->pub_key);
+        Safefree(DH_P_PTR(dh));
+        Safefree(DH_G_PTR(dh));
+        Safefree(DH_PRIVKEY_PTR(dh));
+        Safefree(DH_PUBKEY_PTR(dh));
 
         Safefree(dh);