Changeset f87c490

Timestamp:

Apr 20, 2003, 3:48:31 PM (21 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

master, barnowl_perlaim, debian, owl, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

e51b410

Parents:

aaf6071

Message:

CTRL and META are now OWL_CTRL and OWL_META.  OWL_CTRL moved to keypress.c
do_encrypt declaired static

Files:

• ChangeLog (modified) (1 diff)
• keymap.c (modified) (1 diff)
• keypress.c (modified) (4 diffs)
• owl.h (modified) (1 diff)
• zcrypt.c (modified) (1 diff)

ChangeLog

@@ -65 +65 @@
         Remove some ancient stuff from zcrypt.c
         General cleanup to Makefile.in
+        CTRL and META are now OWL_CTRL and OWL_META.  OWL_CTRL moved to
+          keypress.c
+        do_encrypt declaired static
         
 1.2.8

keymap.c

@@ -214 +214 @@
   }
   if (kh->in_esc) {
-    j = META(j);
+    j = OWL_META(j);
     kh->in_esc = 0;
   }

keypress.c

@@ -127 +127 @@
 };
 
+#define OWL_CTRL(key) ((key)&037)
+/* OWL_META is definied in owl.h */
+
 /* returns 0 on success */
 int owl_keypress_tostring(int j, int esc, char *buff, int bufflen) {
@@ -134 +137 @@
   *kb = '\0';
   for (sm = specialmap; sm->kj!=0; sm++) {
-    if (j == META(sm->kj) || (esc && j == sm->kj)) {
+    if (j == OWL_META(sm->kj) || (esc && j == sm->kj)) {
       strcat(kb, "M-");
       strcat(kb, sm->ks);
@@ -144 +147 @@
   }
   if (!*kb) {
-    if (j&META(0)) {
+    if (j&OWL_META(0)) {
       strcat(kb, "M-");
-      j &= ~META(0);
-    }
-    if ((CTRL(j) == j)) {
+      j &= ~OWL_META(0);
+    }
+    if ((OWL_CTRL(j) == j)) {
       strcat(kb, "C-");
       j |= 0x60;
@@ -196 +199 @@
   if (j==ERR) return(ERR);
   if (isctrl) {
-    j = CTRL(j);
+    j = OWL_CTRL(j);
   }
   if (ismeta) {
-    j = META(j);
+    j = OWL_META(j);
   }
   return(j);

owl.h

@@ -112 +112 @@
 #define OWL_CMD_ALIAS_SUMMARY_PREFIX "command alias to: "
 
-#ifndef CTRL
-#define CTRL(key) ((key)&037)
-#endif
-#ifndef META
-#define META(key) ((key)|0200)
-#endif
+#define OWL_META(key) ((key)|0200)
+/* OWL_CTRL is definied in kepress.c */
 
 #define LINE 2048

zcrypt.c

@@ -52 +52 @@
 char *GetZephyrVarKeyFile(char *whoami, char *class, char *instance);
 char *BuildArgString(char **argv, int start, int end);
-int do_encrypt(char *keystring, int zephyr, char *class, char *instance, ZWRITEOPTIONS *zoptions, char* keyfile);
+static int do_encrypt(char *keystring, int zephyr, char *class, char *instance, ZWRITEOPTIONS *zoptions, char* keyfile);
 int do_decrypt(char *keystring);