thorsson_cups 0.0.38 → 0.0.39

data/ext/cups.c

@@ -196,22 +196,6 @@ static VALUE cups_show_dests(VALUE self)
   return dest_list;
 }
 
-static VALUE cups_test(VALUE self)
-{
-  int num_dests = cupsGetDests(&dests); // Size of dest_list array
-  cupsFreeDests(num_dests, dests);
-  return Qtrue;
-}
-
-static VALUE cups_test2(VALUE self)
-{
-  int i, j;
-  i = 1;
-  j = 2;
-  i = i + j;
-  return Qtrue;
-}
-
 /*
 * call-seq:
 *   Cups.default_printer -> String or nil
@@ -225,8 +209,9 @@ static VALUE cups_get_default(VALUE self)
 
   if (default_printer != NULL) {
     VALUE def_p = rb_str_new2(default_printer);
-    if(default_printer != NULL)
-      free(default_printer);
+
+    cupsFreeDests(default_printer);
+      
     return def_p;
   }
   // should return nil if no default printer is found!
@@ -251,8 +236,8 @@ static VALUE cups_cancel(VALUE self)
     char *target = RSTRING_PTR(printer); // Target printer string
     int cancellation;
     cancellation = cupsCancelJob(target, job);
-    if(target != NULL)
-      free(target);
+    
+    cupsFreeDests(cancellation);
     return Qtrue;
   }
 }
@@ -460,7 +445,7 @@ static VALUE cups_get_jobs(VALUE self, VALUE printer)
   if(printer_arg != NULL)
     free(printer_arg);
     
-
+  cupsFreeDests(num_jobs, jobs);
   return job_list;
 }
 
@@ -589,33 +574,14 @@ static VALUE cups_get_options(VALUE self, VALUE printer)
   cups_dest_t *dest = cupsGetDest(printer_arg, NULL, num_dests, dests);
 
   if (dest == NULL) {
-    cupsFreeDests(num_dests, dests);
-    
-    if(printer_arg != NULL)
-      free(printer_arg);
-    
-    if(dests != NULL)
-      free(dests);
-    
-    if(dest != NULL)
-      free(dest);
-    
+    cupsFreeDests(num_dests, dests);    
     return Qnil;
   } else {
     for(i =0; i< dest->num_options; i++) {
       rb_hash_aset(options_list, rb_str_new2(dest->options[i].name), rb_str_new2(dest->options[i].value));
     }
 
-    cupsFreeDests(num_dests, dests);
-    
-    if(printer_arg != NULL)
-      free(printer_arg);
-    
-    if(dests != NULL)
-      free(dests);
-    
-    if(dest != NULL)
-      free(dest);
+    cupsFreeDests(num_dests, dests, dest);
     
     return options_list;
   }
@@ -648,8 +614,6 @@ void Init_cups() {
 
   // Cups Module Methods
   rb_define_singleton_method(rubyCups, "show_destinations", cups_show_dests, 0);
-  rb_define_singleton_method(rubyCups, "test", cups_test, 0);
-  rb_define_singleton_method(rubyCups, "test2", cups_test2, 0);
   rb_define_singleton_method(rubyCups, "default_printer", cups_get_default, 0);
   rb_define_singleton_method(rubyCups, "all_jobs", cups_get_jobs, 1);
   rb_define_singleton_method(rubyCups, "cancel_print", cups_cancel_print, -1);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thorsson_cups
 version: !ruby/object:Gem::Version
-  version: 0.0.38
+  version: 0.0.39
   prerelease: 
 platform: ruby
 authors: