removing printing = SOFTQ since no one knows what it is

(This used to be commit 283953472229952f7f2613a207515580cd0919c3)

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index b0da86872974c528129bcb22fcda83dd41424f80..f86ed281e47d152b6a5502e59cb0936efcfe7c4e 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -597,7 +597,6 @@ static const struct enum_list enum_printing[] = {
        {PRINT_QNX, "qnx"},
        {PRINT_PLP, "plp"},
        {PRINT_LPRNG, "lprng"},
-       {PRINT_SOFTQ, "softq"},
        {PRINT_CUPS, "cups"},
        {PRINT_LPRNT, "nt"},
        {PRINT_LPROS2, "os2"},
@@ -1218,17 +1217,6 @@ static void init_printer_values(void)
                        string_set(&sDefault.szPrintcommand, "lp -r -P%p %s");
                        break;
 
-               case PRINT_SOFTQ:
-                       string_set(&sDefault.szLpqcommand, "qstat -l -d%p");
-                       string_set(&sDefault.szLprmcommand,
-                                  "qstat -s -j%j -c");
-                       string_set(&sDefault.szPrintcommand,
-                                  "lp -d%p -s %s; rm %s");
-                       string_set(&sDefault.szLppausecommand,
-                                  "qstat -s -j%j -h");
-                       string_set(&sDefault.szLpresumecommand,
-                                  "qstat -s -j%j -r");
-                       break;
 #ifdef DEVELOPER
        case PRINT_TEST:
        case PRINT_VLP:

diff --git a/source3/printing/lpq_parse.c b/source3/printing/lpq_parse.c
index f7f7affc12cbe399e2f6b3c2497939576a3a4533..b2f45ad36627570bc52b8d969018f42b1ae4bb29 100644 (file)
--- a/source3/printing/lpq_parse.c
+++ b/source3/printing/lpq_parse.c
@@ -709,86 +709,6 @@ static BOOL parse_lpq_plp(char *line,print_queue_struct *buf,BOOL first)
   return(True);
 }
 
-/****************************************************************************
-parse a qstat line
-
-here is an example of "qstat -l -d qms" output under softq
-
-Queue qms: 2 jobs; daemon active (313); enabled; accepting;
- job-ID   submission-time     pri     size owner      title 
-205980: H 98/03/09 13:04:05     0    15733 stephenf   chap1.ps
-206086:>  98/03/12 17:24:40     0      659 chris      -
-206087:   98/03/12 17:24:45     0     4876 chris      -
-Total:      21268 bytes in queue
-
-
-****************************************************************************/
-static BOOL parse_lpq_softq(char *line,print_queue_struct *buf,BOOL first)
-{
-  fstring tok[10];
-  int count=0;
-  const char *cline = line;
-
-  /* mung all the ":"s to spaces*/
-  string_sub(line,":"," ",0);
-  
-  for (count=0; count<10 && next_token(&cline,tok[count],NULL,sizeof(tok[count])); count++) ;
-
-  /* we must get 9 tokens */
-  if (count < 9)
-    return(False);
-
-  /* the 1st and 7th columns must be integer */
-  if (!isdigit((int)*tok[0]) || !isdigit((int)*tok[6]))  return(False);
-  /* if the 2nd column is either '>' or 'H' then the 7th and 8th must be
-   * integer, else it's the 6th and 7th that must be
-   */
-  if (*tok[1] == 'H' || *tok[1] == '>')
-    {
-      if (!isdigit((int)*tok[7]))
-        return(False);
-      buf->status = *tok[1] == '>' ? LPQ_PRINTING : LPQ_PAUSED;
-      count = 1;
-    }
-  else
-    {
-      if (!isdigit((int)*tok[5]))
-        return(False);
-      buf->status = LPQ_QUEUED;
-      count = 0;
-    }
-       
-
-  buf->job = atoi(tok[0]);
-  buf->size = atoi(tok[count+6]);
-  buf->priority = atoi(tok[count+5]);
-  fstrcpy(buf->fs_user,tok[count+7]);
-  fstrcpy(buf->fs_file,tok[count+8]);
-  buf->time = time(NULL);              /* default case: take current time */
-  {
-    time_t jobtime;
-    struct tm *t;
-
-    t = localtime(&buf->time);
-    t->tm_mday = atoi(tok[count+2]+6);
-    t->tm_mon  = atoi(tok[count+2]+3);
-    switch (*tok[count+2])
-    {
-    case 7: case 8: case 9: t->tm_year = atoi(tok[count+2]); break;
-    default:                t->tm_year = atoi(tok[count+2]); break;
-    }
-
-    t->tm_hour = atoi(tok[count+3]);
-    t->tm_min = atoi(tok[count+4]);
-    t->tm_sec = atoi(tok[count+5]);
-    jobtime = mktime(t);
-    if (jobtime != (time_t)-1)
-      buf->time = jobtime; 
-  }
-
-  return(True);
-}
-
 /*******************************************************************
 parse lpq on an NT system
 
@@ -1027,9 +947,6 @@ BOOL parse_lpq_entry(int snum,char *line,
     case PRINT_PLP:
       ret = parse_lpq_plp(line,buf,first);
       break;
-    case PRINT_SOFTQ:
-      ret = parse_lpq_softq(line,buf,first);
-      break;
     case PRINT_LPRNT:
       ret = parse_lpq_nt(line,buf,first);
       break;