So, what is the status of that now? IOW do you agree with the bellow or does 
anything else prevent it from getting applied?

The stuff is currently broken on openSUSE Factory and Fedora 15 and any other 
distro that uses gcc 4.6 and I really don´t want to carry that patch along 
separately. Even more I would like to get it in before v5 is branched so it 
doesn't have to get applied to 3 different branches.


On Tuesday May 24 2011 20:30:05 Stephan Kleine wrote:
> On Tuesday May 24 2011 14:10:41 Matthew Mundell wrote:
> > Thanks.  I've committed manager and libraries/omp parts.
> 
> Thanks :)
> 
> > Glancing over the others, this looks wrong
> > 
> >     @@ -437,11 +436,10 @@ oval_plugin_add (char *folder, char *nam
> >     
> >                        descriptions = g_strjoinv (NULL, title_array);
> >                        if (strlen (descriptions) > 3100)
> >                              
> >                              {
> >     
> >     -              description =
> >     -                g_strconcat
> >     +              nvti_set_description (first_plugin, g_strconcat
> >     
> >                                      ("This OVAL file contains the 
> > following definitions:
> \n",
> 
> >                                       g_strndup (descriptions, 3100),
> >     
> >     -                 "\n(list cut due to memory limitations)", NULL);
> >     +                 "\n(list cut due to memory limitations)", NULL));
> >     
> >                              }
> 
> Well, I just copied it from the else branch. The problem is that
> description is set but never used (which breaks compilation), so, if you
> think the above is wrong, the whole if branch should get removed.
> 
> > and for this I'd put the new || on a new line, otherwise is may be
> > overlooked
> > 
> >     @@ -101,7 +101,7 @@ openvassd_shared_socket_register (int so
> >     
> >        e = internal_recv (soc, &buffer, &bufsz, &type);
> >        if ((type & INTERNAL_COMM_MSG_SHARED_SOCKET) == 0
> >     
> >     -      || (type & INTERNAL_COMM_SHARED_SOCKET_DORECVMSG) == 0)
> >     +      || (type & INTERNAL_COMM_SHARED_SOCKET_DORECVMSG) == 0 || e ==
> >     -1)
> >     
> >              {
> >              
> >                log_write ("shared_socket_register(): Error - unexpected 
> > message
> > 
> > %d\n", type);
> 
> That´s fine with me. I just added e since ignoring the returned value
> breaks compilation.
> 
> regards,
> Stephan
_______________________________________________
Openvas-devel mailing list
Openvas-devel@wald.intevation.org
http://lists.wald.intevation.org/mailman/listinfo/openvas-devel

Reply via email to