Attachment #177170 for bug #253504

View | Details | Raw Unified | Return to bug 253504
Collapse All | Expand All

Lines 128-134 Link Here

(-)sanei/sanei_net.c (-1 / +1 lines)
128	void	128	void
129	sanei_w_option_descriptor_array (Wire w, SANE_Option_Descriptor_Array a)	129	sanei_w_option_descriptor_array (Wire w, SANE_Option_Descriptor_Array a)
130	{	130	{
131	sanei_w_array (w, &a->num_options, (void **) &a->desc,	131	sanei_w_array (w, &a->num_options, (void *)(void ) &a->desc,
132	(WireCodecFunc) sanei_w_option_descriptor_ptr,	132	(WireCodecFunc) sanei_w_option_descriptor_ptr,
133	sizeof (a->desc[0]));	133	sizeof (a->desc[0]));
134	}	134	}




      break;

    case SANE_CONSTRAINT_RANGE:
      sanei_w_ptr (w, (void **)(void *) &v->constraint.range,
		   (WireCodecFunc) sanei_w_range, sizeof (SANE_Range));
      break;

    case SANE_CONSTRAINT_WORD_LIST:
      if (w->direction != WIRE_DECODE)
	len = v->constraint.word_list[0] + 1;
      sanei_w_array (w, &len, (void **)(void *) &v->constraint.word_list,
		     w->codec.w_word, sizeof (SANE_Word));
      break;


	  for (len = 0; v->constraint.string_list[len]; ++len);
	  ++len;		/* send NULL string, too */
	}
      sanei_w_array (w, &len, (void **)(void *) &v->constraint.string_list,
		     w->codec.w_string, sizeof (SANE_String));
      break;
    }

Return to bug 253504

Lines 515-528 Link Here

(-)sanei/sanei_wire.c (-3 / +3 lines)
515	break;	515	break;
516		516
517	case SANE_CONSTRAINT_RANGE:	517	case SANE_CONSTRAINT_RANGE:
518	sanei_w_ptr (w, (void **) &v->constraint.range,	518	sanei_w_ptr (w, (void *)(void ) &v->constraint.range,
519	(WireCodecFunc) sanei_w_range, sizeof (SANE_Range));	519	(WireCodecFunc) sanei_w_range, sizeof (SANE_Range));
520	break;	520	break;
521		521
522	case SANE_CONSTRAINT_WORD_LIST:	522	case SANE_CONSTRAINT_WORD_LIST:
523	if (w->direction != WIRE_DECODE)	523	if (w->direction != WIRE_DECODE)
524	len = v->constraint.word_list[0] + 1;	524	len = v->constraint.word_list[0] + 1;
525	sanei_w_array (w, &len, (void **) &v->constraint.word_list,	525	sanei_w_array (w, &len, (void *)(void ) &v->constraint.word_list,
526	w->codec.w_word, sizeof (SANE_Word));	526	w->codec.w_word, sizeof (SANE_Word));
527	break;	527	break;
528		528
Lines 532-538 Link Here
532	for (len = 0; v->constraint.string_list[len]; ++len);	532	for (len = 0; v->constraint.string_list[len]; ++len);
533	++len; /* send NULL string, too */	533	++len; /* send NULL string, too */
534	}	534	}
535	sanei_w_array (w, &len, (void **) &v->constraint.string_list,	535	sanei_w_array (w, &len, (void *)(void ) &v->constraint.string_list,
536	w->codec.w_string, sizeof (SANE_String));	536	w->codec.w_string, sizeof (SANE_String));
537	break;	537	break;
538	}	538	}