Author: jan
Date: 2007-09-13 15:16:23 +0200 (Thu, 13 Sep 2007)
New Revision: 385
Modified:
trunk/openvas-libnasl/ChangeLog
trunk/openvas-libnasl/nasl/nasl_cmd_exec.c
trunk/openvas-libnasl/nasl/nasl_grammar.y
trunk/openvas-libnasl/nasl/nasl_misc_funcs.c
trunk/openvas-libnasl/nasl/nasl_nessusd_glue.c
trunk/openvas-libnasl/nasl/nasl_socket.c
Log:
Various little patches that were part of or inspired by the
patch by Dirk Jagdmann posted as "libnasl patchset [2/6]" on
[EMAIL PROTECTED]
* nasl/nasl_cmd_exec.c (nasl_get_tmp_dir): Removed usused
variables "p" and "warn". Fixed "Nessus" to "OpenVAS" strings.
Fixed state_dir paths.
(nasl_file_read, nasl_file_seek): Removed unused variable "len".
(nasl_file_open): Default of "imode" now O_RDONLY istead of
uninitialized.
* nasl/nasl_grammar.y: Added missing include.
* nasl/nasl_misc_funcs.c (nasl_open_sock_kdc): Removed unusued
variables "val", "_tcp", "_port", "prefs", "t".
(nasl_gettimeofday): Fixed type mismatch.
* nasl/nasl_nessusd_glue.c(nasl_shared_socket_register): Removed
unused variable "opt_len" and "type".
(nasl_shared_socket_release, nasl_shared_socket_destroy): Removed
unused variable "fd".
* nasl_socket.c(nasl_get_source_port): Removed unused variable "i".
Modified: trunk/openvas-libnasl/ChangeLog
===================================================================
--- trunk/openvas-libnasl/ChangeLog 2007-09-13 11:08:50 UTC (rev 384)
+++ trunk/openvas-libnasl/ChangeLog 2007-09-13 13:16:23 UTC (rev 385)
@@ -1,3 +1,29 @@
+2007-09-13 Jan-Oliver Wagner <[EMAIL PROTECTED]>
+
+ Various little patches that were part of or inspired by the
+ patch by Dirk Jagdmann posted as "libnasl patchset [2/6]" on
+ [EMAIL PROTECTED]
+
+ * nasl/nasl_cmd_exec.c (nasl_get_tmp_dir): Removed usused
+ variables "p" and "warn". Fixed "Nessus" to "OpenVAS" strings.
+ Fixed state_dir paths.
+ (nasl_file_read, nasl_file_seek): Removed unused variable "len".
+ (nasl_file_open): Default of "imode" now O_RDONLY istead of
+ uninitialized.
+
+ * nasl/nasl_grammar.y: Added missing include.
+
+ * nasl/nasl_misc_funcs.c (nasl_open_sock_kdc): Removed unusued
+ variables "val", "_tcp", "_port", "prefs", "t".
+ (nasl_gettimeofday): Fixed type mismatch.
+
+ * nasl/nasl_nessusd_glue.c(nasl_shared_socket_register): Removed
+ unused variable "opt_len" and "type".
+ (nasl_shared_socket_release, nasl_shared_socket_destroy): Removed
+ unused variable "fd".
+
+ * nasl_socket.c(nasl_get_source_port): Removed unused variable "i".
+
2007-08-01 Jan-Oliver Wagner <[EMAIL PROTECTED]>
* TODO: Added some items that Dirk Jagdmann posted
Modified: trunk/openvas-libnasl/nasl/nasl_cmd_exec.c
===================================================================
--- trunk/openvas-libnasl/nasl/nasl_cmd_exec.c 2007-09-13 11:08:50 UTC (rev
384)
+++ trunk/openvas-libnasl/nasl/nasl_cmd_exec.c 2007-09-13 13:16:23 UTC (rev
385)
@@ -393,14 +393,13 @@
nasl_get_tmp_dir(lex_ctxt * lexic)
{
tree_cell *retc;
- char *p, path[MAXPATHLEN];
- int warn = 0;
+ char path[MAXPATHLEN];
if (check_authenticated(lexic) < 0) return NULL;
- snprintf(path, sizeof(path), "%s/nessus/tmp/", NESSUS_STATE_DIR);
+ snprintf(path, sizeof(path), "%s/lib/openvas/tmp/", NESSUS_STATE_DIR);
if (access(path, R_OK|W_OK|X_OK) < 0)
{
- nasl_perror(lexic, "get_tmp_dir(): %s not available - check your Nessus
installation\n", path);
+ nasl_perror(lexic, "get_tmp_dir(): %s not available - check your OpenVAS
installation\n", path);
return NULL;
}
@@ -447,7 +446,7 @@
tree_cell *retc;
char *fname, *mode;
int fd;
- int imode;
+ int imode = O_RDONLY;
if ( check_authenticated(lexic) < 0 ) return NULL;
@@ -522,7 +521,6 @@
{
tree_cell *retc;
char *buf;
- int len;
int fd;
int flength;
int n;
@@ -615,7 +613,6 @@
nasl_file_seek(lex_ctxt * lexic)
{
tree_cell *retc;
- int len;
int fd;
int foffset;
Modified: trunk/openvas-libnasl/nasl/nasl_grammar.y
===================================================================
--- trunk/openvas-libnasl/nasl/nasl_grammar.y 2007-09-13 11:08:50 UTC (rev
384)
+++ trunk/openvas-libnasl/nasl/nasl_grammar.y 2007-09-13 13:16:23 UTC (rev
385)
@@ -30,6 +30,7 @@
#include "nasl_var.h"
#include "nasl_lex_ctxt.h"
#include "nasl_debug.h"
+#include "nasl_crypto2.h"
static void naslerror(const char *);
#define YYERROR_VERBOSE
@@ -1197,10 +1198,7 @@
}
}
-int
-nasllex(lvalp, parm)
- YYSTYPE *lvalp;
- void *parm;
+int nasllex(YYSTYPE * lvalp, void * parm)
{
int x = mylex(lvalp, parm);
Modified: trunk/openvas-libnasl/nasl/nasl_misc_funcs.c
===================================================================
--- trunk/openvas-libnasl/nasl/nasl_misc_funcs.c 2007-09-13 11:08:50 UTC
(rev 384)
+++ trunk/openvas-libnasl/nasl/nasl_misc_funcs.c 2007-09-13 13:16:23 UTC
(rev 385)
@@ -744,7 +744,7 @@
nasl_perror(lexic, "gettimeofday: %s\n", strerror(errno));
return NULL;
}
- sprintf(str, "%u.%06u", t.tv_sec, t.tv_usec);
+ sprintf(str, "%u.%06u", (unsigned int)t.tv_sec, (unsigned int)t.tv_usec);
retc = alloc_typed_cell(CONST_DATA);
retc->size = strlen(str);
retc->x.str_val = emalloc(retc->size);
@@ -834,15 +834,12 @@
nasl_open_sock_kdc(lex_ctxt* lexic)
{
tree_cell *retc;
- struct timeval t;
int timeout = 30;
int port = 88;
char *hostname = NULL; /* Domain name for windows */
int tcp = 0;
int ret;
- struct arglist *script_infos, *prefs;
- char *_port = NULL, *_tcp = NULL;
- char * val;
+ struct arglist *script_infos;
int type;
Modified: trunk/openvas-libnasl/nasl/nasl_nessusd_glue.c
===================================================================
--- trunk/openvas-libnasl/nasl/nasl_nessusd_glue.c 2007-09-13 11:08:50 UTC
(rev 384)
+++ trunk/openvas-libnasl/nasl/nasl_nessusd_glue.c 2007-09-13 13:16:23 UTC
(rev 385)
@@ -1010,7 +1010,6 @@
char * name = get_str_local_var_by_name(lexic, "name");
int soc = get_int_local_var_by_name(lexic, "socket", -1);
struct arglist * script_infos = lexic->script_infos;
- int type, opt_len = sizeof(type);
if ( name == NULL || soc < 0 )
{
@@ -1053,7 +1052,6 @@
tree_cell * nasl_shared_socket_release( lex_ctxt * lexic )
{
char * name = get_str_var_by_num(lexic, 0);
- int fd;
struct arglist * script_infos = lexic->script_infos;
if ( name == NULL )
@@ -1072,7 +1070,6 @@
tree_cell * nasl_shared_socket_destroy( lex_ctxt * lexic )
{
char * name = get_str_var_by_num(lexic, 0);
- int fd;
struct arglist * script_infos = lexic->script_infos;
if ( name == NULL )
Modified: trunk/openvas-libnasl/nasl/nasl_socket.c
===================================================================
--- trunk/openvas-libnasl/nasl/nasl_socket.c 2007-09-13 11:08:50 UTC (rev
384)
+++ trunk/openvas-libnasl/nasl/nasl_socket.c 2007-09-13 13:16:23 UTC (rev
385)
@@ -753,7 +753,7 @@
nasl_get_source_port(lex_ctxt* lexic)
{
struct sockaddr_in ia;
- int i, s, fd;
+ int s, fd;
unsigned int l;
tree_cell *retc;
int type;
_______________________________________________
Openvas-commits mailing list
[email protected]
http://lists.wald.intevation.org/mailman/listinfo/openvas-commits
