1 files changed, 8 insertions, 10 deletions
diff --git a/src/service/util/serviceutil.c b/src/service/util/serviceutil.c
index 121360d..522c78e 100644
--- a/src/service/util/serviceutil.c
+++ b/src/service/util/serviceutil.c
@@ -29,8 +29,6 @@
 
 #include "serviceutil.h"
 
-#define OPERATION_BUFSIZE 300
-#define STATUS_BUFSIZE 2000
 #define MAX_SLIST_CNT 1000
 
 char *suscript = "/usr/libexec/serviceutil.sh";
@@ -63,7 +61,7 @@ Service_Free_SList(SList *slist)
 SList *
 Service_Find_All(void)
 {
-  char svname[256];
+  char svname[BUFLEN];
   Control *cc = malloc(sizeof(Control));
   SList *slist;
 
@@ -101,18 +99,18 @@ Service_Find_All(void)
 void *
 Service_Begin_Enum(const char *service)
 {
-  char cmdbuffer[STATUS_BUFSIZE];
+  char cmdbuffer[BUFLEN];
   Control *cc = malloc(sizeof(Control));
 
   memset(&cmdbuffer, '\0', sizeof(cmdbuffer));
 
   if (cc)
   {
-    snprintf(cmdbuffer, STATUS_BUFSIZE, "%s status %s", suscript, service);
+    snprintf(cmdbuffer, BUFLEN, "%s status %s", suscript, service);
     cc->fp = popen(cmdbuffer, "r");
     if (cc->fp)
     {
-      snprintf(cmdbuffer, STATUS_BUFSIZE, "%s is-enabled %s", suscript, service);
+      snprintf(cmdbuffer, BUFLEN, "%s is-enabled %s", suscript, service);
       cc->fp2 = popen(cmdbuffer, "r");
       if (!cc->fp2)
       {
@@ -134,8 +132,8 @@ Service_Begin_Enum(const char *service)
 int
 Service_Next_Enum(void *handle, Service* svc, const char *service)
 {
-  char result[2000];
-  char svname[256];
+  char result[BUFLEN];
+  char svname[BUFLEN];
   int pid = 0;
   Control *cc = (Control *) handle;
   int state = 0, ret = 0;
@@ -204,7 +202,7 @@ unsigned int
 Service_Operation(const char *service, const char *method, char *result, int resultlen)
 {
   int res = 0;
-  char cmdbuffer[OPERATION_BUFSIZE];
+  char cmdbuffer[BUFLEN];
   const char *const proc_path = "/proc/self/fd/";
   char template[] = "/tmp/Service_OperationXXXXXX";
 
@@ -218,7 +216,7 @@ Service_Operation(const char *service, const char *method, char *result, int res
   char cmd[cmd_size];
   snprintf(cmd, cmd_size, "%s%ul", proc_path, tfd);
 
-  snprintf(cmdbuffer, OPERATION_BUFSIZE, "%s %s %s > %s", suscript, method, service, cmd);
+  snprintf(cmdbuffer, BUFLEN, "%s %s %s > %s", suscript, method, service, cmd);
 
   res = system(cmdbuffer);