← Back to branch summary

~n-muench/ubuntu/precise/open-vm-tools/open-vm-tools-precise.sid-merge1

« back to all changes in this revision

Viewing changes to lib/slashProc/net.c

  • Committer: Bazaar Package Importer
  • Author(s): Daniel Baumann
  • Date: 2009-12-06 07:45:05 UTC
  • mfrom: (1.1.8 upstream) (2.4.10 sid)
  • Revision ID: james.westby@ubuntu.com-20091206074505-43rp7oejjgp0y2re
Tags: 2009.11.16-210370-1
http://bugs.debian.org/545222
http://bugs.debian.org/549044
http://bugs.debian.org/551626
* Merging upstream version 2009.11.16-210370.
* Moving vmusr plugins from open-vm-tools to open-vm-toolbox (Closes:
  #539282, #557215).
* Correcting plugin location (Closes: #545222, #549044).
* Dropping la files (Closes: #551626).
* Adding open-vm-toolbox lintian overrides.
* Removing test plugin.
* Removing unused plugin symlinks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/slashProc/net.c
373
373
   myValLine = NULL;
374
374
 
375
375
   close(fd);
376
 
 
377
 
   g_free(myChannel);
 
376
   g_io_channel_unref(myChannel);
378
377
 
379
378
   return myHashTable;
380
379
}
485
484
   }
486
485
 
487
486
   close(fd);
488
 
 
489
 
   g_free(myChannel);
 
487
   g_io_channel_unref(myChannel);
490
488
 
491
489
   return myHashTable;
492
490
}
643
641
 
644
642
out:
645
643
   g_free(myLine);
646
 
   g_free(myChannel);
647
 
 
648
644
   close(fd);
 
645
   g_io_channel_unref(myChannel);
649
646
 
650
647
   return myArray;
651
648
}
792
789
 
793
790
   g_free(myLine);
794
791
   myLine = NULL;
795
 
   g_free(myChannel);
796
 
   myChannel = NULL;
 
792
 
 
793
   close(fd);
 
794
   g_io_channel_unref(myChannel);
797
795
 
798
796
   return myArray;
799
797
}