ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/hopm/branches/1.0.x/src/scan.c
(Generate patch)

Comparing hopm/trunk/src/scan.c (file contents):
Revision 5052 by michael, Mon Dec 22 11:56:03 2014 UTC vs.
Revision 5072 by michael, Mon Dec 22 15:33:29 2014 UTC

# Line 89 | Line 89 | struct cnode *nc_head;
89  
90   struct scan_struct *scan_create(char **, char *);
91   void scan_free(struct scan_struct *);
92 < static void scan_irckline(struct scan_struct *, char *, char *);
92 > static void scan_irckline(struct scan_struct *, const char *, const char *);
93   static void scan_negative(struct scan_struct *);
94   static void scan_log(OPM_REMOTE_T *);
95  
# Line 169 | Line 169 | void scan_timer(void)
169   *
170   */
171  
172 < char *scan_gettype(int protocol)
172 > const char *scan_gettype(int protocol)
173   {
174     unsigned int i;
175 <   static char *undef = "undefined";
175 >   static const char *undef = "undefined";
176  
177     static struct protocol_assoc protocols[] =
178        {
# Line 572 | Line 572 | void scan_checkfinished(struct scan_stru
572   *
573   */
574  
575 < void scan_positive(struct scan_struct *ss, char *kline, char *type)
575 > void scan_positive(struct scan_struct *ss, const char *kline, const char *type)
576   {
577     node_t *node;
578     OPM_T *scanner;
# Line 674 | Line 674 | void scan_open_proxy(OPM_T *scanner, OPM
674   void scan_negotiation_failed(OPM_T *scanner, OPM_REMOTE_T *remote,
675        int notused, void *data)
676   {
677 <   struct scan_struct *ss;
677 > //   struct scan_struct *ss;
678     struct scanner_struct *scs;
679  
680     USE_VAR(scanner);
# Line 684 | Line 684 | void scan_negotiation_failed(OPM_T *scan
684     scan_log(remote);
685  
686     scs = (struct scanner_struct *) data;
687 <   ss = (struct scan_struct *) remote->data;
687 > //   ss = (struct scan_struct *) remote->data;
688  
689     if(OPT_DEBUG)
690     {
# Line 720 | Line 720 | void scan_negotiation_failed(OPM_T *scan
720   static void scan_timeout(OPM_T *scanner, OPM_REMOTE_T *remote, int notused,
721        void *data)
722   {
723 <   struct scan_struct *ss;
723 > //   struct scan_struct *ss;
724     struct scanner_struct *scs;
725  
726     USE_VAR(scanner);
# Line 730 | Line 730 | static void scan_timeout(OPM_T *scanner,
730     scan_log(remote);
731  
732     scs = (struct scanner_struct *) data;
733 <   ss = (struct scan_struct *) remote->data;
733 > //   ss = (struct scan_struct *) remote->data;
734  
735     if(OPT_DEBUG)
736     {
# Line 899 | Line 899 | static void scan_negative(struct scan_st
899   *
900   */
901  
902 < static void scan_irckline(struct scan_struct *ss, char *format, char *type)
902 > static void scan_irckline(struct scan_struct *ss, const char *format, const char *type)
903   {
904  
905     char message[MSGLENMAX];  /* OUTPUT */
# Line 956 | Line 956 | static void scan_irckline(struct scan_st
956                    {
957                       case FORMATTYPE_STRING:
958  
959 <                        size = strlen( (char *) table[i].data);
959 >                        size = strlen(table[i].data);
960  
961                          /* Check if the new string can fit! */
962                          if( (size + len) > (MSGLENMAX - 1) )
963                             break;
964                          else
965                          {
966 <                           strcat(message, (char *) table[i].data);
966 >                           strcat(message, table[i].data);
967                             len += size;
968                          }
969  
# Line 1141 | Line 1141 | int scan_checkexempt(char *mask, char *i
1141  
1142     LIST_FOREACH(node, ExemptItem->masks->head)
1143     {
1144 <      exempt_mask = (char *) node->data;
1144 >      exempt_mask = node->data;
1145        if(match(exempt_mask, mask) || match(exempt_mask, ipmask))
1146           return 1;
1147     }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines