Changeset 35598

Timestamp:

May 27, 2013, 2:30:08 PM (13 years ago)

Author:

eugene

Message:

deprecate KiiOpen.c (rename KiiClose to KapaClose)

Location:

branches/eam_branches/ipp-20130509/Ohana/src/libkapa

Files:

• Makefile (modified) (2 diffs)
• include/kapa.h (modified) (3 diffs)
• src/KapaOpen.c (modified) (1 diff)

branches/eam_branches/ipp-20130509/Ohana/src/libkapa/Makefile

@@ -24 +24 @@
 $(SRC)/IOfuncs.$(ARCH).o  \
 $(SRC)/KiiPicture.$(ARCH).o \
-$(SRC)/KiiOpen.$(ARCH).o \
 $(SRC)/KiiOverlay.$(ARCH).o \
 $(SRC)/KiiCursor.$(ARCH).o \
@@ -31 +30 @@
 $(SRC)/KapaColors.$(ARCH).o \
 $(SRC)/KapaOpen.$(ARCH).o
+
+# deprecated:
+# $(SRC)/KiiOpen.$(ARCH).o
 
 DRAW = \

branches/eam_branches/ipp-20130509/Ohana/src/libkapa/include/kapa.h

@@ -142 +142 @@
 char *KiiRecvData (int device);
 int KiiWaitAnswer (int device, char *expect);
-
-/* KiiOpen.c */
-int KiiOpen (char *kii_exec, char *name);
-int KiiClose (int socket);
-int KiiWait (char *sockpath);
 
 /* KiiPicture.c */
@@ -271 +266 @@
 int KapaOpenNamedSocket (char *kapa_exec, char *name);
 int KapaWaitNamedSocket (char *sockpath);
+int KapaClose (int socket);
 
 /* define Kapa names for shared functions */
@@ -281 +277 @@
 # define KapaPS(fd,s,r,f) KiiPS(fd,s,r,f)
 
-# define KapaClose(socket) KiiClose(socket)
+// deprecated
+// # define KapaClose(socket) KiiClose(socket)
 # define KapaWait(sockpath) KiiWait(sockpath)
 # define KapaSendCommandV(device, length, format, argp) KiiSendCommandV(device, length, format, argp)

branches/eam_branches/ipp-20130509/Ohana/src/libkapa/src/KapaOpen.c

@@ -430 +430 @@
   return (pid);
 }
+
+int KapaClose (int fd) {
+
+  if (fd < 1) return (FALSE);
+  KiiSendCommand (fd, 4, "QUIT");
+  close (fd);
+  return (TRUE);
+}